Skip to content

Commit 88747f1

Browse files
ideakjnikula
authored andcommitted
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>
1 parent ac9b823 commit 88747f1

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

drivers/gpu/drm/i915/intel_display.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5258,7 +5258,14 @@ intel_display_port_aux_power_domain(struct intel_encoder *intel_encoder)
52585258

52595259
switch (intel_encoder->type) {
52605260
case INTEL_OUTPUT_UNKNOWN:
5261-
/* Only DDI platforms should ever use this output type */
5261+
case INTEL_OUTPUT_HDMI:
5262+
/*
5263+
* Only DDI platforms should ever use these output types.
5264+
* We can get here after the HDMI detect code has already set
5265+
* the type of the shared encoder. Since we can't be sure
5266+
* what's the status of the given connectors, play safe and
5267+
* run the DP detection too.
5268+
*/
52625269
WARN_ON_ONCE(!HAS_DDI(dev));
52635270
case INTEL_OUTPUT_DISPLAYPORT:
52645271
case INTEL_OUTPUT_EDP:

0 commit comments

Comments
 (0)