]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
drm/i915: Don't clobber crtc->new_config when nothing changes
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 21 Nov 2014 19:00:36 +0000 (21:00 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 3 Dec 2014 08:29:34 +0000 (09:29 +0100)
commitb9950a133f8bcfbe30ad11ae27ed75668fffe5cd
treef9cbe9f14101c20949a8267c91c6287ef2aed0b8
parent4fcd01d0f34645710ac92d5523e26019428b0806
drm/i915: Don't clobber crtc->new_config when nothing changes

When doing a nop modeset we currently leave crtc->new_config point at
the already freed temporary pipe_config. That will anger the sanity
checks in intel_modeset_update_state() when the nop modeset gets
followed by a GPU reset on gen3/4 where the display block gets fully
reinitialized during the reset.

So leave crtc->new_config alone until we know a modeset is actually
required.

Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c