]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915: Use the correct PCH transcoder for LPT/WPT in intel_sanitize_frame_start_de...
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 28 Nov 2019 18:23:58 +0000 (20:23 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 2 Dec 2019 14:11:25 +0000 (16:11 +0200)
LPT/WPT only have PCH transcoder A. Make sure we poke at its
chicken register instead of some non-existent register when
FDI is being driven by pipe B or C.

Cc: Uma Shankar <uma.shankar@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191128182358.14477-1-ville.syrjala@linux.intel.com
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
drivers/gpu/drm/i915/display/intel_display.c

index 7d6d0393d73ffbdd801d638049209b0433f9677b..7ba12d603f59d8d764f39536a0d536771b03377c 100644 (file)
@@ -17272,7 +17272,8 @@ static void intel_sanitize_frame_start_delay(const struct intel_crtc_state *crtc
                val |= TRANS_FRAME_START_DELAY(0);
                I915_WRITE(reg, val);
        } else {
-               i915_reg_t reg = TRANS_CHICKEN2(crtc->pipe);
+               enum pipe pch_transcoder = intel_crtc_pch_transcoder(crtc);
+               i915_reg_t reg = TRANS_CHICKEN2(pch_transcoder);
                u32 val;
 
                val = I915_READ(reg);