drm/i915: set CPT FDI RX polarity bits based on VBT
Subsystems (2)
PATCH 1/2 drm/i915: set CPT FDI RX polarity bits based on VBT
From: Paulo Zanoni <[email protected]>
Check the VBT to see if the machine has inverted FDI RX polarity on CPT. Based on this bit, set the appropriate bit on the TRANS_CHICKEN2 registers.
This should fix some machines that were showing black screens on all outputs.
Cc: [email protected]
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=60029
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_bios.c | 6 ++++-- drivers/gpu/drm/i915/intel_bios.h | 4 +++- drivers/gpu/drm/i915/intel_pm.c | 9 +++++++-- 5 files changed, 16 insertions(+), 6 deletions(-)
This is *not* the patch tested by the bug reporters, but I believe this is equivalent. I'm also posting this patch on bugzilla right now, so we'll get test reports for this one too.
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -964,6 +964,7 @@ typedef struct drm_i915_private { unsigned int int_crt_support:1; unsigned int lvds_use_ssc:1; unsigned int display_clock_mode:1; + unsigned int fdi_rx_polarity_inverted:1;int lvds_ssc_freq;unsigned int bios_lvds_val;/* initial [PCH_]LVDS reg val in VBIOS */ struct {
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -3950,7 +3950,7 @@#define _TRANSB_CHICKEN2 0xf1064#define TRANS_CHICKEN2 (pipe) _PIPE(pipe, _TRANSA_CHICKEN2, _TRANSB_CHICKEN2)#define TRANS_CHICKEN2_TIMING_OVERRIDE (1<<31) - +#define TRANS_CHICKEN2_FDI_POLARITY_REVERSED (1<<29)#define SOUTH_CHICKEN1 0xc2000#define FDIA_PHASE_SYNC_SHIFT_OVR 19
drivers/gpu/drm/i915/intel_bios.c +4 -2
@@ -351,12 +351,14 @@ parse_general_features(struct drm_i915_private *dev_priv, dev_priv->lvds_ssc_freq =intel_bios_ssc_frequency (dev, general->ssc_freq); dev_priv->display_clock_mode = general->display_clock_mode; -DRM_DEBUG_KMS ("BDB_GENERAL_FEATURES int_tv_support %d int_crt_support %d lvds_use_ssc %d lvds_ssc_freq %d display_clock_mode %d\n" , + dev_priv->fdi_rx_polarity_inverted = general->fdi_rx_polarity_inverted; +DRM_DEBUG_KMS ("BDB_GENERAL_FEATURES int_tv_support %d int_crt_support %d lvds_use_ssc %d lvds_ssc_freq %d display_clock_mode %d fdi_rx_polarity_inverted %d\n" , dev_priv->int_tv_support, dev_priv->int_crt_support, dev_priv->lvds_use_ssc, dev_priv->lvds_ssc_freq, - dev_priv->display_clock_mode); + dev_priv->display_clock_mode, + dev_priv->fdi_rx_polarity_inverted); } }
drivers/gpu/drm/i915/intel_bios.h +3 -1
@@ -127,7 +127,9 @@ struct bdb_general_features {/* bits 3 */ u8 disable_smooth_vision:1; u8 single_dvi:1; - u8 rsvd9:6; /* finish byte */ + u8 rsvd9:1; + u8 fdi_rx_polarity_inverted:1; + u8 rsvd10:4; /* finish byte *//* bits 4 */ u8 legacy_monitor_detect;
drivers/gpu/drm/i915/intel_pm.c +7 -2
@@ -3575,6 +3575,7 @@ static void cpt_init_clock_gating(struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;int pipe; +uint32_t val;/* * On Ibex Peak and Cougar Point, we need to disable clock
@@ -3587,8 +3588,12 @@ static void cpt_init_clock_gating(struct drm_device *dev)/* The below fixes the weird display corruption, a few pixels shifted * downward, on (only) LVDS of some HP laptops with IVY. */ -for_each_pipe (pipe) -I915_WRITE (TRANS_CHICKEN2 (pipe),TRANS_CHICKEN2_TIMING_OVERRIDE ); +for_each_pipe (pipe) { + val =TRANS_CHICKEN2_TIMING_OVERRIDE ; +if (dev_priv->fdi_rx_polarity_inverted) + val |=TRANS_CHICKEN2_FDI_POLARITY_REVERSED ; +I915_WRITE (TRANS_CHICKEN2 (pipe), val); + }/* WADP0ClockGatingDisable */ for_each_pipe (pipe) { I915_WRITE(TRANS_CHICKEN1(pipe),
Signature · 1 line
1.7.10.4
PATCH 2/2 drm/i915: preserve the PBC bits of TRANS_CHICKEN2
From: Paulo Zanoni <[email protected]>
Bits 30 and 24:0 are PBC, so don't zero them. Some of the other bits are being zeroed, but I couldn't find a reason for this, so leave them as they are for now to avoid regressions.
--- drivers/gpu/drm/i915/i915_reg.h | 8 ++++++-- drivers/gpu/drm/i915/intel_pm.c | 7 ++++++- 2 files changed, 12 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +6 -2
@@ -3949,8 +3949,12 @@#define _TRANSA_CHICKEN2 0xf0064#define _TRANSB_CHICKEN2 0xf1064#define TRANS_CHICKEN2 (pipe) _PIPE(pipe, _TRANSA_CHICKEN2, _TRANSB_CHICKEN2) -#define TRANS_CHICKEN2_TIMING_OVERRIDE (1<<31) -#define TRANS_CHICKEN2_FDI_POLARITY_REVERSED (1<<29) +#define TRANS_CHICKEN2_TIMING_OVERRIDE (1<<31) +#define TRANS_CHICKEN2_FDI_POLARITY_REVERSED (1<<29) +#define TRANS_CHICKEN2_FRAME_START_DELAY_MASK (3<<27) +#define TRANS_CHICKEN2_DISABLE_DEEP_COLOR_COUNTER (1<<26) +#define TRANS_CHICKEN2_DISABLE_DEEP_COLOR_MODESWITCH (1<<25) +#define TRANS_CHICKEN2_PBC (1<<30 | 0x1ffffff)#define SOUTH_CHICKEN1 0xc2000#define FDIA_PHASE_SYNC_SHIFT_OVR 19
drivers/gpu/drm/i915/intel_pm.c +6 -1
@@ -3589,9 +3589,14 @@ static void cpt_init_clock_gating(struct drm_device *dev)* downward, on (only) LVDS of some HP laptops with IVY. */ for_each_pipe (pipe) { - val =TRANS_CHICKEN2_TIMING_OVERRIDE ; + val =I915_READ (TRANS_CHICKEN2 (pipe)); + val |=TRANS_CHICKEN2_TIMING_OVERRIDE ; + val &= ~TRANS_CHICKEN2_FDI_POLARITY_REVERSED ;if (dev_priv->fdi_rx_polarity_inverted) val |=TRANS_CHICKEN2_FDI_POLARITY_REVERSED ; + val &= ~TRANS_CHICKEN2_FRAME_START_DELAY_MASK ; + val &= ~TRANS_CHICKEN2_DISABLE_DEEP_COLOR_COUNTER ; + val &= ~TRANS_CHICKEN2_DISABLE_DEEP_COLOR_MODESWITCH ;I915_WRITE (TRANS_CHICKEN2 (pipe), val); }/* WADP0ClockGatingDisable */
Signature · 1 line
1.7.10.4
Re: [PATCH 2/2] drm/i915: preserve the PBC bits of TRANS_CHICKEN2
Quoted 18 lines · Paulo Zanoni
From: Paulo Zanoni <[email protected]>
Bits 30 and 24:0 are PBC, so don't zero them. Some of the other bits are being zeroed, but I couldn't find a reason for this, so leave them as they are for now to avoid regressions.
Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 8 ++++++-- drivers/gpu/drm/i915/intel_pm.c | 7 ++++++- 2 files changed, 12 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/i915_reg.h +0
-0@@ -3949,8 +3949,12 @@#define _TRANSA_CHICKEN2 0xf0064
drivers/gpu/drm/i915/i915_reg.h line 3957
Quoted 10 lines
drivers/gpu/drm/i915/i915_reg.h +6
-2#define _TRANSB_CHICKEN2 0xf1064#define TRANS_CHICKEN2 (pipe) _PIPE(pipe, _TRANSA_CHICKEN2, _TRANSB_CHICKEN2) -#define TRANS_CHICKEN2_TIMING_OVERRIDE (1<<31) -#define TRANS_CHICKEN2_FDI_POLARITY_REVERSED (1<<29) +#define TRANS_CHICKEN2_TIMING_OVERRIDE (1<<31) +#define TRANS_CHICKEN2_FDI_POLARITY_REVERSED (1<<29) +#define TRANS_CHICKEN2_FRAME_START_DELAY_MASK (3<<27) +#define TRANS_CHICKEN2_DISABLE_DEEP_COLOR_COUNTER (1<<26) +#define TRANS_CHICKEN2_DISABLE_DEEP_COLOR_MODESWITCH (1<<25) +#define TRANS_CHICKEN2_PBC (1<<30 | 0x1ffffff)
The above _PBC value seems to be redundant. In any case on both patches:
Quoted 23 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define SOUTH_CHICKEN1 0xc2000#define FDIA_PHASE_SYNC_SHIFT_OVR 19drivers/gpu/drm/i915/intel_pm.c +6
-1@@ -3589,9 +3589,14 @@ static void cpt_init_clock_gating(struct drm_device *dev)* downward, on (only) LVDS of some HP laptops with IVY. */ for_each_pipe (pipe) { - val =TRANS_CHICKEN2_TIMING_OVERRIDE ; + val =I915_READ (TRANS_CHICKEN2 (pipe)); + val |=TRANS_CHICKEN2_TIMING_OVERRIDE ; + val &= ~TRANS_CHICKEN2_FDI_POLARITY_REVERSED ;if (dev_priv->fdi_rx_polarity_inverted) val |=TRANS_CHICKEN2_FDI_POLARITY_REVERSED ; + val &= ~TRANS_CHICKEN2_FRAME_START_DELAY_MASK ; + val &= ~TRANS_CHICKEN2_DISABLE_DEEP_COLOR_COUNTER ; + val &= ~TRANS_CHICKEN2_DISABLE_DEEP_COLOR_MODESWITCH ;I915_WRITE (TRANS_CHICKEN2 (pipe), val); }/* WADP0ClockGatingDisable */
Re: [PATCH 2/2] drm/i915: preserve the PBC bits of TRANS_CHICKEN2
Quoted 31 lines · Imre Deak
Quoted 18 lines · Paulo Zanoni
From: Paulo Zanoni <[email protected]>
Bits 30 and 24:0 are PBC, so don't zero them. Some of the other bits are being zeroed, but I couldn't find a reason for this, so leave them as they are for now to avoid regressions.
Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 8 ++++++-- drivers/gpu/drm/i915/intel_pm.c | 7 ++++++- 2 files changed, 12 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/i915_reg.h +0
-0@@ -3949,8 +3949,12 @@#define _TRANSA_CHICKEN2 0xf0064drivers/gpu/drm/i915/i915_reg.h line 3957
Quoted 10 lines
drivers/gpu/drm/i915/i915_reg.h +6
-2#define _TRANSB_CHICKEN2 0xf1064#define TRANS_CHICKEN2 (pipe) _PIPE(pipe, _TRANSA_CHICKEN2, _TRANSB_CHICKEN2) -#define TRANS_CHICKEN2_TIMING_OVERRIDE (1<<31) -#define TRANS_CHICKEN2_FDI_POLARITY_REVERSED (1<<29) +#define TRANS_CHICKEN2_TIMING_OVERRIDE (1<<31) +#define TRANS_CHICKEN2_FDI_POLARITY_REVERSED (1<<29) +#define TRANS_CHICKEN2_FRAME_START_DELAY_MASK (3<<27) +#define TRANS_CHICKEN2_DISABLE_DEEP_COLOR_COUNTER (1<<26) +#define TRANS_CHICKEN2_DISABLE_DEEP_COLOR_MODESWITCH (1<<25) +#define TRANS_CHICKEN2_PBC (1<<30 | 0x1ffffff)The above
_PBCvalue seems to be redundant. In any case on both patches:
Quoted 1 line
Reviewed-by Imre Deak <[email protected]>
Redundant #define deleted and both patches merged, thanks. -Daniel
Quoted 30 lines
Quoted 14 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define SOUTH_CHICKEN1 0xc2000#define FDIA_PHASE_SYNC_SHIFT_OVR 19drivers/gpu/drm/i915/intel_pm.c +1
-1@@ -3589,9 +3589,14 @@ static void cpt_init_clock_gating(struct drm_device *dev)* downward, on (only) LVDS of some HP laptops with IVY. */ for_each_pipe (pipe) { - val =TRANS_CHICKEN2_TIMING_OVERRIDE ; + val =I915_READ (TRANS_CHICKEN2 (pipe));drivers/gpu/drm/i915/intel_pm.c static void cpt_init_clock_gating(struct drm_device *dev) · line 3602
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +5
-0+ val |=TRANS_CHICKEN2_TIMING_OVERRIDE ; + val &= ~TRANS_CHICKEN2_FDI_POLARITY_REVERSED ;if (dev_priv->fdi_rx_polarity_inverted) val |=TRANS_CHICKEN2_FDI_POLARITY_REVERSED ; + val &= ~TRANS_CHICKEN2_FRAME_START_DELAY_MASK ; + val &= ~TRANS_CHICKEN2_DISABLE_DEEP_COLOR_COUNTER ; + val &= ~TRANS_CHICKEN2_DISABLE_DEEP_COLOR_MODESWITCH ;I915_WRITE (TRANS_CHICKEN2 (pipe), val); }/* WADP0ClockGatingDisable */ _______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Hi
2013/4/8 Paulo Zanoni <[email protected]>:
Quoted 21 lines
From: Paulo Zanoni <[email protected]>
Check the VBT to see if the machine has inverted FDI RX polarity on CPT. Based on this bit, set the appropriate bit on the
TRANS_CHICKEN2registers.This should fix some machines that were showing black screens on all outputs.
Cc: [email protected]
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=60029Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_bios.c | 6 ++++-- drivers/gpu/drm/i915/intel_bios.h | 4 +++- drivers/gpu/drm/i915/intel_pm.c | 9 +++++++-- 5 files changed, 16 insertions(+), 6 deletions(-)
Quoted 3 lines
This is *not* the patch tested by the bug reporters, but I believe this is equivalent. I'm also posting this patch on bugzilla right now, so we'll get test reports for this one too.
We already have some reporters saying that the new patch works for them too :)
Quoted 91 lines
drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -964,6 +964,7 @@ typedef struct drm_i915_private { unsigned int int_crt_support:1; unsigned int lvds_use_ssc:1; unsigned int display_clock_mode:1; + unsigned int fdi_rx_polarity_inverted:1;int lvds_ssc_freq;unsigned int bios_lvds_val;/* initial [PCH_]LVDS reg val in VBIOS */ struct {drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -3950,7 +3950,7 @@#define _TRANSB_CHICKEN2 0xf1064#define TRANS_CHICKEN2 (pipe) _PIPE(pipe, _TRANSA_CHICKEN2, _TRANSB_CHICKEN2)#define TRANS_CHICKEN2_TIMING_OVERRIDE (1<<31) - +#define TRANS_CHICKEN2_FDI_POLARITY_REVERSED (1<<29)#define SOUTH_CHICKEN1 0xc2000#define FDIA_PHASE_SYNC_SHIFT_OVR 19drivers/gpu/drm/i915/intel_bios.c +4
-2@@ -351,12 +351,14 @@ parse_general_features(struct drm_i915_private *dev_priv, dev_priv->lvds_ssc_freq =intel_bios_ssc_frequency (dev, general->ssc_freq); dev_priv->display_clock_mode = general->display_clock_mode; -DRM_DEBUG_KMS ("BDB_GENERAL_FEATURES int_tv_support %d int_crt_support %d lvds_use_ssc %d lvds_ssc_freq %d display_clock_mode %d\n" , + dev_priv->fdi_rx_polarity_inverted = general->fdi_rx_polarity_inverted; +DRM_DEBUG_KMS ("BDB_GENERAL_FEATURES int_tv_support %d int_crt_support %d lvds_use_ssc %d lvds_ssc_freq %d display_clock_mode %d fdi_rx_polarity_inverted %d\n" , dev_priv->int_tv_support, dev_priv->int_crt_support, dev_priv->lvds_use_ssc, dev_priv->lvds_ssc_freq, - dev_priv->display_clock_mode); + dev_priv->display_clock_mode, + dev_priv->fdi_rx_polarity_inverted); } }drivers/gpu/drm/i915/intel_bios.h +3
-1@@ -127,7 +127,9 @@ struct bdb_general_features {/* bits 3 */ u8 disable_smooth_vision:1; u8 single_dvi:1; - u8 rsvd9:6; /* finish byte */ + u8 rsvd9:1; + u8 fdi_rx_polarity_inverted:1; + u8 rsvd10:4; /* finish byte *//* bits 4 */ u8 legacy_monitor_detect;drivers/gpu/drm/i915/intel_pm.c +7
-3@@ -3575,6 +3575,7 @@ static void cpt_init_clock_gating(struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;int pipe; +uint32_t val;/* * On Ibex Peak and Cougar Point, we need to disable clock @@ -3587,8 +3588,12 @@ static void cpt_init_clock_gating(struct drm_device *dev)/* The below fixes the weird display corruption, a few pixels shifted * downward, on (only) LVDS of some HP laptops with IVY. */ -for_each_pipe (pipe) -I915_WRITE (TRANS_CHICKEN2 (pipe),TRANS_CHICKEN2_TIMING_OVERRIDE ); +for_each_pipe (pipe) { + val =TRANS_CHICKEN2_TIMING_OVERRIDE ; +if (dev_priv->fdi_rx_polarity_inverted) + val |=TRANS_CHICKEN2_FDI_POLARITY_REVERSED ; +I915_WRITE (TRANS_CHICKEN2 (pipe), val); + }/* WADP0ClockGatingDisable */ for_each_pipe (pipe) { I915_WRITE(TRANS_CHICKEN1(pipe), --
Quoted 2 lines
1.7.10.4
--
Paulo Zanoni