Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5f05388 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/fb: add support for not enabling fbcon on non-desktop displays [v2] 



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: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 66660d4c

drivers/gpu/drm/drm_fb_helper.c

+5 −1
Original line number Diff line number Diff line
@@ -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
@@ -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];

	}