Skip to content

Commit

Permalink
drm/fb: add support for not enabling fbcon on non-desktop displays [v2]
Browse files Browse the repository at this point in the history
We don't want fbcon to get used on non-desktop dislays,
don't pass them as enabled connectors to the fb helper setup.

This prevents my HMD from getting disorted fbcon, and from
affecting other displays console.

v2: Change description from non-standard to non-desktop

Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Dave Airlie committed Nov 23, 2017
1 parent 66660d4 commit b5f0538
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/gpu/drm/drm_fb_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -2033,6 +2033,9 @@ static bool drm_connector_enabled(struct drm_connector *connector, bool strict)
{
bool enable;

if (connector->display_info.non_desktop)
return false;

if (strict)
enable = connector->status == connector_status_connected;
else
Expand All @@ -2052,7 +2055,8 @@ static void drm_enable_connectors(struct drm_fb_helper *fb_helper,
connector = fb_helper->connector_info[i]->connector;
enabled[i] = drm_connector_enabled(connector, true);
DRM_DEBUG_KMS("connector %d enabled? %s\n", connector->base.id,
enabled[i] ? "yes" : "no");
connector->display_info.non_desktop ? "non desktop" : enabled[i] ? "yes" : "no");

any_enabled |= enabled[i];
}

Expand Down

0 comments on commit b5f0538

Please sign in to comment.