]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Don't do edp panel detection in g4x_dp_detect()
authorAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Wed, 18 Nov 2015 15:19:29 +0000 (17:19 +0200)
committerAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Wed, 18 Nov 2015 15:47:03 +0000 (17:47 +0200)
commit9708d2f3fbf1f975c13b97a562c77cdfe080eee5
tree3f408cc8fb7db3a637959354426946a4c227650f
parentec0d541c336a9f4aba8f97bb17bc689838d3f3a2
drm/i915: Don't do edp panel detection in g4x_dp_detect()

That call was moved to intel_dp_detect() in

commit 40e3c55375b1ad36629fba45f2701c2b6479f8e6
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Tue Sep 2 20:03:59 2014 +0100

    drm/i915/dp: Refactor common eDP lid detection

but it seem to have been resurrected in the following commit, probably
due to a wrong merge conflict resolution.

commit daabf6493456a2658ae700d1c49cfd33838886fc
Author: Dave Airlie <airlied@redhat.com>
Date:   Mon Sep 1 16:58:12 2014 +1000

    drm/i915: handle G45/GM45 pulse detection connected state.

Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1447859970-9546-1-git-send-email-ander.conselvan.de.oliveira@intel.com
drivers/gpu/drm/i915/intel_dp.c