Skip to content

Commit a39eec1

Browse files
committed
drm/i915/dpio: s/VLV_PLL_DW9_BCAST/VLV_PCS_DW17_BCAST/
VLV_PLL_DW9_BCAST is actually VLV_PCS_DW17_BCAST. The address does kinda look like it goes to the PLL block on a first glance, but broadcast is special and doesn't even exist for the PLL (only PCS and TX have it). The fact that we use a broadcast write here is a bit sketchy IMO since we're now blasting the register to all PCS splines across the whole PHY. So the PCS registers in the other channel (ie. other pipe/port) will also be written. But I guess the fact that we always write the same value should make this a nop even if the other channel is already enabled (assuming the VBIOS/GOP didn't screw up and use some other value...). Signed-off-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Reviewed-by: Jani Nikula <[email protected]>
1 parent 5dad21d commit a39eec1

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

drivers/gpu/drm/i915/display/intel_dpll.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1920,7 +1920,7 @@ static void vlv_prepare_pll(const struct intel_crtc_state *crtc_state)
19201920
vlv_pllb_recal_opamp(dev_priv, phy);
19211921

19221922
/* Set up Tx target for periodic Rcomp update */
1923-
vlv_dpio_write(dev_priv, phy, VLV_PLL_DW9_BCAST, 0x0100000f);
1923+
vlv_dpio_write(dev_priv, phy, VLV_PCS_DW17_BCAST, 0x0100000f);
19241924

19251925
/* Disable target IRef on PLL */
19261926
reg_val = vlv_dpio_read(dev_priv, phy, VLV_PLL_DW8(pipe));

drivers/gpu/drm/i915/i915_reg.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@
233233
#define _VLV_PLL_DW8_CH1 0x8060
234234
#define VLV_PLL_DW8(ch) _PIPE(ch, _VLV_PLL_DW8_CH0, _VLV_PLL_DW8_CH1)
235235

236-
#define VLV_PLL_DW9_BCAST 0xc044
237236
#define _VLV_PLL_DW9_CH0 0x8044
238237
#define _VLV_PLL_DW9_CH1 0x8064
239238
#define VLV_PLL_DW9(ch) _PIPE(ch, _VLV_PLL_DW9_CH0, _VLV_PLL_DW9_CH1)
@@ -370,6 +369,8 @@
370369
#define _VLV_PCS_DW14_CH1 0x8438
371370
#define VLV_PCS_DW14(ch) _PORT(ch, _VLV_PCS_DW14_CH0, _VLV_PCS_DW14_CH1)
372371

372+
#define VLV_PCS_DW17_BCAST 0xc044
373+
373374
#define _VLV_PCS_DW23_CH0 0x825c
374375
#define _VLV_PCS_DW23_CH1 0x845c
375376
#define VLV_PCS_DW23(ch) _PORT(ch, _VLV_PCS_DW23_CH0, _VLV_PCS_DW23_CH1)

0 commit comments

Comments
 (0)