ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-21 14:37:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

intel_fb: disable encoders of disconnected ports

Browse Source 
On disconnect of displays, e.g. seen with Type-C connectors, the encoder was
not properly disabled due to a missing drm_client_modeset_commit. In order that
the commit succeed, however a fb must be assigned to the modeset. Missing to
do so leads to an -EINVAL by the drm_client_modeset_commit.

Fixes #4948
This commit is contained in:
Alexander Boettcher 2023-06-29 15:18:18 +02:00 committed by Norman Feske
parent 70c57a3be3
commit 1f1fafb0cf
1 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
repos/pc/src/drivers/framebuffer/intel/pc/lx_user.c
View File

@ -224,11 +224,11 @@ static unsigned get_brightness(struct drm_connector * const connector,
return ret * MAX_BRIGHTNESS / panel->backlight.device->props.max_brightness;
}
static struct drm_mode_fb_cmd2 dumb_fb = {};
static bool reconfigure(struct drm_client_dev * const dev)
{
static struct drm_mode_create_dumb gem_dumb = {};
static struct drm_mode_fb_cmd2 dumb_fb = {};
struct drm_display_mode mode_preferred = {};
struct drm_display_mode mode_minimum = {};
@ -532,19 +532,49 @@ void i915_switcheroo_unregister(struct drm_i915_private *i915)
static int fb_client_hotplug(struct drm_client_dev *client)
{
struct drm_mode_set *modeset = NULL;
struct drm_framebuffer *fb = NULL;
int result = -EINVAL;
if (dumb_fb.fb_id)
fb = drm_framebuffer_lookup(client->dev, client->file, dumb_fb.fb_id);
/*
* Triggers set up of display pipelines for enabled connectors and
* Triggers set up of display pipelines for connectors and
* stores the config in the client's modeset array.
*/
int const result = drm_client_modeset_probe(client,
0 /* auto width */,
0 /* auto height */);
if (result)
result = drm_client_modeset_probe(client, 0 /* auto width */,
0 /* auto height */);
if (result) {
printk("%s: error on modeset probe %d\n", __func__, result);
return result;
}
/*
* (Re-)assign framebuffer to modeset (lost due to modeset_probe) and
* commit the change.
*/
if (fb) {
mutex_lock(&client->modeset_mutex);
drm_client_for_each_modeset(modeset, client) {
if (!modeset || !modeset->num_connectors)
continue;
modeset->fb = fb;
}
mutex_unlock(&client->modeset_mutex);
/* triggers disablement of encoders attached to disconnected ports */
result = drm_client_modeset_commit(client);
if (result)
printk("%s: error on modeset commit %d\n", __func__, result);
}
/* notify Genode side */
lx_emul_i915_hotplug_connector(client);
return 0;
return result;
}