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

Commit 04dbff52 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Fix resume regression from 5d1d0cc8 



The irony of the patch to fix the resume regression on PineView causing
a further regression on Ironlake is not lost on me.

Reported-by: default avatarJeff Chua <jeff.chua.linux@gmail.com>
Reported-by: default avatarBjörn Schließmann <chronoss@gmx.de>
Tested-by: default avatarBjörn Schließmann <chronoss@gmx.de>
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=28802


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 8102e126

drivers/gpu/drm/i915/intel_display.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -5558,9 +5558,7 @@ static void intel_crtc_reset(struct drm_crtc *crtc) 
	/* Reset flags back to the 'unknown' status so that they

	/* Reset flags back to the 'unknown' status so that they

	 * will be correctly set on the initial modeset.

	 * will be correctly set on the initial modeset.

	 */

	 */

	intel_crtc->cursor_addr = 0;

	intel_crtc->dpms_mode = -1;

	intel_crtc->dpms_mode = -1;

	intel_crtc->active = true; /* force the pipe off on setup_init_config */

}

}





static struct drm_crtc_helper_funcs intel_helper_funcs = {

static struct drm_crtc_helper_funcs intel_helper_funcs = {
@@ -5666,6 +5664,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe) 
	dev_priv->pipe_to_crtc_mapping[intel_crtc->pipe] = &intel_crtc->base;

	dev_priv->pipe_to_crtc_mapping[intel_crtc->pipe] = &intel_crtc->base;





	intel_crtc_reset(&intel_crtc->base);

	intel_crtc_reset(&intel_crtc->base);

	intel_crtc->active = true; /* force the pipe off on setup_init_config */





	if (HAS_PCH_SPLIT(dev)) {

	if (HAS_PCH_SPLIT(dev)) {

		intel_helper_funcs.prepare = ironlake_crtc_prepare;

		intel_helper_funcs.prepare = ironlake_crtc_prepare;