From: Ville Syrjälä Date: Wed, 7 Nov 2018 17:18:21 +0000 (+0200) Subject: drm/i915: Switch LSPCON to PCON mode if it's in LS mode X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6bd36e0822ca841bbb21d050e80cd690209bd322;p=linux.git drm/i915: Switch LSPCON to PCON mode if it's in LS mode We no longer change LSPCON into PCON mode if it boots up in LS mode. This was broken by some code shuffling in commit 96e35598cead ("drm/i915: Check LSPCON vendor OUI"). I actually can't see a reason why that code shuffling had to be done. The commit msg notes it but doesn't justify it in any way. But I guess we'll keep the code in its current place anyway and just make the "switch to PCON mode" part effective once again. Cc: Shashank Sharma Cc: Maarten Lankhorst Cc: Tvrtko Ursulin Tested-by: Tvrtko Ursulin Fixes: 96e35598cead ("drm/i915: Check LSPCON vendor OUI") Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20181107171821.27862-1-ville.syrjala@linux.intel.com Reviewed-by: Shashank Sharma --- diff --git a/drivers/gpu/drm/i915/intel_lspcon.c b/drivers/gpu/drm/i915/intel_lspcon.c index fff32b31c7df3..96a8d9524b0c2 100644 --- a/drivers/gpu/drm/i915/intel_lspcon.c +++ b/drivers/gpu/drm/i915/intel_lspcon.c @@ -230,7 +230,7 @@ static bool lspcon_probe(struct intel_lspcon *lspcon) * In this way, it will work with both HDMI 1.4 sinks as well as HDMI * 2.0 sinks. */ - if (lspcon->active && lspcon->mode != DRM_LSPCON_MODE_PCON) { + if (lspcon->mode != DRM_LSPCON_MODE_PCON) { if (lspcon_change_mode(lspcon, DRM_LSPCON_MODE_PCON) < 0) { DRM_ERROR("LSPCON mode change to PCON failed\n"); return false;