]> git.karo-electronics.de Git - karo-tx-linux.git/commit
drm/i915/ddi: fix intel_display_port_aux_power_domain() after HDMI detect
authorImre Deak <imre.deak@intel.com>
Fri, 27 Nov 2015 16:55:27 +0000 (18:55 +0200)
committerJani Nikula <jani.nikula@intel.com>
Wed, 2 Dec 2015 14:42:56 +0000 (16:42 +0200)
commit88747f133b20e1a2b2f303a68c97ebca211eddc1
tree9e3a34a910162af4d95f764e7417e674d6accf18
parentac9b8236551d1177fd07b56aef9b565d1864420d
drm/i915/ddi: fix intel_display_port_aux_power_domain() after HDMI detect

Due to the current sharing of the DDI encoder between DP and HDMI
connectors we can run the DP detection after the HDMI detection has
already set the shared encoder's type. For now solve this keeping the
current behavior and running the detection in this case too. For a proper
solution Ville suggested to split the encoder into an HDMI and DP one, that
can be done as a follow-up.

This issue triggers the WARN in intel_display_port_aux_power_domain() and
was introduced in:
commit 25f78f58e5bfb46a270ce4d690fb49dc104558b1
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date:   Mon Nov 16 15:01:04 2015 +0100

    drm/i915: Clean up AUX power domain handling

CC: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
CC: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
[Cherry-picked from drm-intel-next-queued 651174a4 (Imre)]
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1448643329-18675-4-git-send-email-imre.deak@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c