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

Commit 9c526fed authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2019-02-20' of... 

Merge tag 'drm-intel-fixes-2019-02-20' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

drm/i915 fbdev takeover fix for v5.0

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87k1hutrmc.fsf@intel.com
parents a3b22b9f d179b88d

drivers/gpu/drm/i915/intel_fbdev.c

+7 −5
Original line number Diff line number Diff line
@@ -336,8 +336,8 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, 
				    bool *enabled, int width, int height)

{

	struct drm_i915_private *dev_priv = to_i915(fb_helper->dev);

	unsigned long conn_configured, conn_seq, mask;

	unsigned int count = min(fb_helper->connector_count, BITS_PER_LONG);

	unsigned long conn_configured, conn_seq;

	int i, j;

	bool *save_enabled;

	bool fallback = true, ret = true;
@@ -355,10 +355,9 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, 
		drm_modeset_backoff(&ctx);



	memcpy(save_enabled, enabled, count);

	mask = GENMASK(count - 1, 0);

	conn_seq = GENMASK(count - 1, 0);

	conn_configured = 0;

retry:

	conn_seq = conn_configured;

	for (i = 0; i < count; i++) {

		struct drm_fb_helper_connector *fb_conn;

		struct drm_connector *connector;
@@ -371,7 +370,8 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, 
		if (conn_configured & BIT(i))

			continue;



		if (conn_seq == 0 && !connector->has_tile)

		/* First pass, only consider tiled connectors */

		if (conn_seq == GENMASK(count - 1, 0) && !connector->has_tile)

			continue;



		if (connector->status == connector_status_connected)
@@ -475,8 +475,10 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, 
		conn_configured |= BIT(i);

	}



	if ((conn_configured & mask) != mask && conn_configured != conn_seq)

	if (conn_configured != conn_seq) { /* repeat until no more are found */

		conn_seq = conn_configured;

		goto retry;

	}



	/*

	 * If the BIOS didn't enable everything it could, fall back to have the