drm/i915/cnl: Fix RMW on ddi vswing sequence.
Subsystems (2)
Rodrigo Vivi
maintainerPATCH 1/1 drm/i915/cnl: Fix RMW on ddi vswing sequence.
Paulo noticed that we were missing few bits clear
before writing values back to the register on
these RMW MMIO operations.
v2: Remove "POST_" from CURSOR_COEFF_MASK. (Paulo).
--- drivers/gpu/drm/i915/i915_reg.h | 9 +++++++++ drivers/gpu/drm/i915/intel_ddi.c | 7 +++++++ 2 files changed, 16 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +9 -0
@@ -1764,8 +1764,11 @@ enum skl_disp_power_wells { _CNL_PORT_TX_DW2_LN0_AE, \ _CNL_PORT_TX_DW2_LN0_F)#define SWING_SEL_UPPER (x) ((x >> 3) << 15) +#define SWING_SEL_UPPER_MASK (1 << 15)#define SWING_SEL_LOWER (x) ((x & 0x7) << 11) +#define SWING_SEL_LOWER_MASK (0x7 << 11)#define RCOMP_SCALAR (x) ((x) << 0) +#define RCOMP_SCALAR_MASK (0xFF << 0)#define _CNL_PORT_TX_DW4_GRP_AE 0x162350#define _CNL_PORT_TX_DW4_GRP_B 0x1623D0
@@ -1795,8 +1798,11 @@ enum skl_disp_power_wells { _CNL_PORT_TX_DW4_LN0_F)#define LOADGEN_SELECT (1 << 31)#define POST_CURSOR_1 (x) ((x) << 12) +#define POST_CURSOR_1_MASK (0x3F << 12)#define POST_CURSOR_2 (x) ((x) << 6) +#define POST_CURSOR_2_MASK (0x3F << 6)#define CURSOR_COEFF (x) ((x) << 0) +#define CURSOR_COEFF_MASK (0x3F << 6)#define _CNL_PORT_TX_DW5_GRP_AE 0x162354#define _CNL_PORT_TX_DW5_GRP_B 0x1623D4
@@ -1825,7 +1831,9 @@ enum skl_disp_power_wells {#define TX_TRAINING_EN (1 << 31)#define TAP3_DISABLE (1 << 29)#define SCALING_MODE_SEL (x) ((x) << 18) +#define SCALING_MODE_SEL_MASK (0x7 << 18)#define RTERM_SELECT (x) ((x) << 3) +#define RTERM_SELECT_MASK (0x7 << 3)#define _CNL_PORT_TX_DW7_GRP_AE 0x16235C#define _CNL_PORT_TX_DW7_GRP_B 0x1623DC
@@ -1852,6 +1860,7 @@ enum skl_disp_power_wells { _CNL_PORT_TX_DW7_LN0_AE, \ _CNL_PORT_TX_DW7_LN0_F)#define N_SCALAR (x) ((x) << 24) +#define N_SCALAR_MASK (0x7F << 24)/* The spec defines this only for BXT PHY0, but lets assume that this * would exist for PHY1 too if it had a second channel.
drivers/gpu/drm/i915/intel_ddi.c +7 -0
@@ -1813,11 +1813,14 @@ static void cnl_ddi_vswing_program(struct drm_i915_private *dev_priv,/* Set PORT_TX_DW5 Scaling Mode Sel to 010b. */ val =I915_READ (CNL_PORT_TX_DW5_LN0 (port)); + val &= ~(SCALING_MODE_SEL_MASK ); val |=SCALING_MODE_SEL (2 );I915_WRITE (CNL_PORT_TX_DW5_GRP (port), val);/* Program PORT_TX_DW2 */ val =I915_READ (CNL_PORT_TX_DW2_LN0 (port)); + val &= ~(SWING_SEL_LOWER_MASK |SWING_SEL_UPPER_MASK | +RCOMP_SCALAR_MASK ); val |=SWING_SEL_UPPER (ddi_translations[level].dw2_swing_sel); val |=SWING_SEL_LOWER (ddi_translations[level].dw2_swing_sel);/* Rcomp scalar is fixed as 0x98 for every table entry */
@@ -1828,6 +1831,8 @@ static void cnl_ddi_vswing_program(struct drm_i915_private *dev_priv,/* We cannot write to GRP. It would overrite individual loadgen */ for (ln =0 ; ln <4 ; ln++) { val =I915_READ (CNL_PORT_TX_DW4_LN (port, ln)); + val &= ~(POST_CURSOR_1_MASK |POST_CURSOR_2_MASK | +CURSOR_COEFF_MASK ); val |=POST_CURSOR_1 (ddi_translations[level].dw4_post_cursor_1); val |=POST_CURSOR_2 (ddi_translations[level].dw4_post_cursor_2); val |=CURSOR_COEFF (ddi_translations[level].dw4_cursor_coeff);
@@ -1837,12 +1842,14 @@ static void cnl_ddi_vswing_program(struct drm_i915_private *dev_priv,/* Program PORT_TX_DW5 */ /* All DW5 values are fixed for every table entry */ val =I915_READ (CNL_PORT_TX_DW5_LN0 (port)); + val &= ~(RTERM_SELECT_MASK ); val |=RTERM_SELECT (6 ); val |=TAP3_DISABLE ;I915_WRITE (CNL_PORT_TX_DW5_GRP (port), val);/* Program PORT_TX_DW7 */ val =I915_READ (CNL_PORT_TX_DW7_LN0 (port)); + val &= ~N_SCALAR_MASK ; val |=N_SCALAR (ddi_translations[level].dw7_n_scalar);I915_WRITE (CNL_PORT_TX_DW7_GRP (port), val); }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/cnl: Fix RMW on ddi vswing sequence. (rev2)
== Series Details ==
== Series Details ==
Series: drm/i915/cnl: Fix RMW on ddi vswing sequence. (rev2)
URL : https://patchwork.freedesktop.org/series/25935/
State : success
== Summary ==
Series 25935v2 drm/i915/cnl: Fix RMW on ddi vswing sequence.
https://patchwork.freedesktop.org/api/1.0/series/25935/revisions/2/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
fail -> PASS (fi-snb-2600) fdo#100007
Test gem_exec_suspend:
Subgroup basic-s4-devices:
dmesg-warn -> PASS (fi-kbl-7560u) fdo#100125
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-atomic:
pass -> FAIL (fi-snb-2600) fdo#100215
Test kms_pipe_crc_basic:
Subgroup bad-nb-words-1:
pass -> DMESG-WARN (fi-skl-6700hq) fdo#101154 +19fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fdo#101154 https://bugs.freedesktop.org/show_bug.cgi?id=101154
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:461s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:483s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:576s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:544s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:489s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:485s fi-glk-2a total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:586s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:432s fi-hsw-4770r total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:16 time:420s fi-ilk-650 total:278 pass:227 dwarn:0 dfail:0 fail:0 skip:50 time:461s fi-ivb-3520m total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:18 time:488s fi-ivb-3770 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:18 time:515s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:476s fi-kbl-7560u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:565s fi-kbl-r total:278 pass:259 dwarn:1 dfail:0 fail:0 skip:18 time:574s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:481s fi-skl-6700hq total:278 pass:224 dwarn:5 dfail:16 fail:11 skip:22 time:475s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:514s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:507s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:507s fi-snb-2520m total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:28 time:625s fi-snb-2600 total:278 pass:246 dwarn:0 dfail:0 fail:2 skip:29 time:403s
18d562c9f6c5127304e02acaba5a67b4ef48b474 drm-tip: 2017y-06m-16d-23h-15m-51s UTC integration manifest 0597857 drm/i915/cnl: Fix RMW on ddi vswing sequence.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4979/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 68 lines · Rodrigo Vivi
Paulo noticed that we were missing few bits clear
before writing values back to the register on
these RMW MMIO operations.v2: Remove "
POST_" fromCURSOR_COEFF_MASK. (Paulo).Fixes cf54ca8bc567 ("drm/i915/cnl: Implement voltage swing sequence.")Cc Paulo Zanoni <[email protected]>Cc Manasi Navare <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Reviewed-by Paulo Zanoni <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 9 +++++++++ drivers/gpu/drm/i915/intel_ddi.c | 7 +++++++ 2 files changed, 16 insertions(+)drivers/gpu/drm/i915/i915_reg.h +9
-0@@ -1764,8 +1764,11 @@ enum skl_disp_power_wells { _CNL_PORT_TX_DW2_LN0_AE, \ _CNL_PORT_TX_DW2_LN0_F)#define SWING_SEL_UPPER (x) ((x >> 3) << 15) +#define SWING_SEL_UPPER_MASK (1 << 15)#define SWING_SEL_LOWER (x) ((x & 0x7) << 11) +#define SWING_SEL_LOWER_MASK (0x7 << 11)#define RCOMP_SCALAR (x) ((x) << 0) +#define RCOMP_SCALAR_MASK (0xFF << 0)#define _CNL_PORT_TX_DW4_GRP_AE 0x162350#define _CNL_PORT_TX_DW4_GRP_B 0x1623D0@@ -1795,8 +1798,11 @@ enum skl_disp_power_wells { _CNL_PORT_TX_DW4_LN0_F)#define LOADGEN_SELECT (1 << 31)#define POST_CURSOR_1 (x) ((x) << 12) +#define POST_CURSOR_1_MASK (0x3F << 12)#define POST_CURSOR_2 (x) ((x) << 6) +#define POST_CURSOR_2_MASK (0x3F << 6)#define CURSOR_COEFF (x) ((x) << 0) +#define CURSOR_COEFF_MASK (0x3F << 6)#define _CNL_PORT_TX_DW5_GRP_AE 0x162354#define _CNL_PORT_TX_DW5_GRP_B 0x1623D4@@ -1825,7 +1831,9 @@ enum skl_disp_power_wells {#define TX_TRAINING_EN (1 << 31)#define TAP3_DISABLE (1 << 29)#define SCALING_MODE_SEL (x) ((x) << 18) +#define SCALING_MODE_SEL_MASK (0x7 << 18)#define RTERM_SELECT (x) ((x) << 3) +#define RTERM_SELECT_MASK (0x7 << 3)#define _CNL_PORT_TX_DW7_GRP_AE 0x16235C#define _CNL_PORT_TX_DW7_GRP_B 0x1623DC@@ -1852,6 +1860,7 @@ enum skl_disp_power_wells { _CNL_PORT_TX_DW7_LN0_AE, \ _CNL_PORT_TX_DW7_LN0_F)#define N_SCALAR (x) ((x) << 24) +#define N_SCALAR_MASK (0x7F << 24)/* The spec defines this only for BXT PHY0, but lets assume that this * would exist for PHY1 too if it had a second channel. drivers/gpu/drm/i915/intel_ddi.c +0
-0
drivers/gpu/drm/i915/intel_ddi.c static void cnl_ddi_vswing_program(struct drm_i915_private *dev_priv, · line 1816
Quoted 4 lines
drivers/gpu/drm/i915/intel_ddi.c +1
-0@@ -1813,11 +1813,14 @@ static void cnl_ddi_vswing_program(struct drm_i915_private *dev_priv,/* Set PORT_TX_DW5 Scaling Mode Sel to 010b. */ val =I915_READ (CNL_PORT_TX_DW5_LN0 (port)); + val &= ~(SCALING_MODE_SEL_MASK );
Unnecessary braces.
Quoted 20 lines
drivers/gpu/drm/i915/intel_ddi.c +4
-0val |=SCALING_MODE_SEL (2 );I915_WRITE (CNL_PORT_TX_DW5_GRP (port), val);/* Program PORT_TX_DW2 */ val =I915_READ (CNL_PORT_TX_DW2_LN0 (port)); + val &= ~(SWING_SEL_LOWER_MASK |SWING_SEL_UPPER_MASK | +RCOMP_SCALAR_MASK ); val |=SWING_SEL_UPPER (ddi_translations[level].dw2_swing_sel); val |=SWING_SEL_LOWER (ddi_translations[level].dw2_swing_sel);/* Rcomp scalar is fixed as 0x98 for every table entry */ @@ -1828,6 +1831,8 @@ static void cnl_ddi_vswing_program(struct drm_i915_private *dev_priv,/* We cannot write to GRP. It would overrite individual loadgen */ for (ln =0 ; ln <4 ; ln++) { val =I915_READ (CNL_PORT_TX_DW4_LN (port, ln)); + val &= ~(POST_CURSOR_1_MASK |POST_CURSOR_2_MASK | +CURSOR_COEFF_MASK ); val |=POST_CURSOR_1 (ddi_translations[level].dw4_post_cursor_1); val |=POST_CURSOR_2 (ddi_translations[level].dw4_post_cursor_2); val |=CURSOR_COEFF (ddi_translations[level].dw4_cursor_coeff);
drivers/gpu/drm/i915/intel_ddi.c static void cnl_ddi_vswing_program(struct drm_i915_private *dev_priv, · line 1845
Quoted 4 lines
drivers/gpu/drm/i915/intel_ddi.c +1
-0@@ -1837,12 +1842,14 @@ static void cnl_ddi_vswing_program(struct drm_i915_private *dev_priv,/* Program PORT_TX_DW5 */ /* All DW5 values are fixed for every table entry */ val =I915_READ (CNL_PORT_TX_DW5_LN0 (port)); + val &= ~(RTERM_SELECT_MASK );
Unnecessary braces.
Quoted 10 lines
drivers/gpu/drm/i915/intel_ddi.c +1
-0val |=RTERM_SELECT (6 ); val |=TAP3_DISABLE ;I915_WRITE (CNL_PORT_TX_DW5_GRP (port), val);/* Program PORT_TX_DW7 */ val =I915_READ (CNL_PORT_TX_DW7_LN0 (port)); + val &= ~N_SCALAR_MASK ; val |=N_SCALAR (ddi_translations[level].dw7_n_scalar);I915_WRITE (CNL_PORT_TX_DW7_GRP (port), val); }
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx