mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-28 20:02:17 +00:00
drm/i915: Fix resume regression from 5d1d0cc
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: Jeff Chua <jeff.chua.linux@gmail.com> Reported-by: Björn Schließmann <chronoss@gmx.de> Tested-by: Björn Schließmann <chronoss@gmx.de> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=28802 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
parent
8102e126c0
commit
04dbff5260
1 changed files with 1 additions and 2 deletions
|
@ -5558,9 +5558,7 @@ static void intel_crtc_reset(struct drm_crtc *crtc)
|
|||
/* Reset flags back to the 'unknown' status so that they
|
||||
* will be correctly set on the initial modeset.
|
||||
*/
|
||||
intel_crtc->cursor_addr = 0;
|
||||
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 = {
|
||||
|
@ -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;
|
||||
|
||||
intel_crtc_reset(&intel_crtc->base);
|
||||
intel_crtc->active = true; /* force the pipe off on setup_init_config */
|
||||
|
||||
if (HAS_PCH_SPLIT(dev)) {
|
||||
intel_helper_funcs.prepare = ironlake_crtc_prepare;
|
||||
|
|
Loading…
Reference in a new issue