]> www.infradead.org Git - users/jedix/linux-maple.git/commit
drm/i915: Be sure to turn hsync/vsync back on at crt enable (v2)
authorAdam Jackson <ajax@redhat.com>
Mon, 25 Mar 2013 19:40:05 +0000 (15:40 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 12 Apr 2013 16:52:04 +0000 (09:52 -0700)
commitd7ca2c16dd8896ba4daa7a674b36ee6025b15e94
tree123d70736804f55b64a158a6ffe7d49bbf9fda4a
parent2705de01e2dcd27e86aafc8837998c885f9cfcef
drm/i915: Be sure to turn hsync/vsync back on at crt enable (v2)

commit 637f44d24f8868ee5a597a99e7874fdd150d4cba upstream.

commit f40ebd6bcbbd0d30591f42dc16be52b5086a366b
Author: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Date:   Tue Mar 5 14:24:48 2013 +0100

    drm/i915: Turn off hsync and vsync on ADPA when disabling crt

properly disabled the hsync/vsync logic at disable time, but neglected
to re-enable them at enable time.

v2: In the enable hook, restore the connector's expected DPMS level
instead of forcing ON.  Do this by stashing a back pointer to the
connector in the crt (suggested by danvet) since otherwise it's awkward
to look up.

Signed-off-by: Adam Jackson <ajax@redhat.com>
[danvet: Added more verbose commit citation and cc: stable tag. Also,
make it compile. Then self-lart and try to assign the right pointer.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/i915/intel_crt.c