]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Deal with video overlay on GPU reset
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 26 Nov 2014 15:07:29 +0000 (17:07 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 3 Dec 2014 08:35:24 +0000 (09:35 +0100)
commit66047160b8085e71e973e2e420fe36198fe3b0a7
treed2332f681e8bbdc9e5382cdeacbec9a5c197b1ce
parentd0859f7be6a907d072a85142c047680bfe4ae73c
drm/i915: Deal with video overlay on GPU reset

Clear the video overlay state on GPU reset. Any pending overlay request
in the ring has been nuked, and the display itself gets reset. So we
pretty much lose all state here. Adjust the software state to match so
that the next "putimage" will restore things to working order.

v2: Ass a locking check into intel_overlay_release_old_vid() (Daniel)

Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
[danvet: s/0/NULL/ to appease sparse, reported by 0-day tester.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_overlay.c