Skip to content

Commit 9a1f576

Browse files
committed
drm/i915: pass dev_priv explicitly to PIPE_WGC_C21_C20
Avoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PIPE_WGC_C21_C20 register macro. Reviewed-by: Rodrigo Vivi <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/af39047d304f8a5c3c7a643f702f66c06ea5d638.1714399071.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <[email protected]>
1 parent 366ec5a commit 9a1f576

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ static void vlv_load_wgc_csc(struct intel_crtc *crtc,
626626
intel_de_write_fw(dev_priv, PIPE_WGC_C12(dev_priv, pipe),
627627
csc->coeff[5]);
628628

629-
intel_de_write_fw(dev_priv, PIPE_WGC_C21_C20(pipe),
629+
intel_de_write_fw(dev_priv, PIPE_WGC_C21_C20(dev_priv, pipe),
630630
csc->coeff[7] << 16 | csc->coeff[6]);
631631
intel_de_write_fw(dev_priv, PIPE_WGC_C22(pipe),
632632
csc->coeff[8]);
@@ -653,7 +653,7 @@ static void vlv_read_wgc_csc(struct intel_crtc *crtc,
653653
tmp = intel_de_read_fw(dev_priv, PIPE_WGC_C12(dev_priv, pipe));
654654
csc->coeff[5] = tmp & 0xffff;
655655

656-
tmp = intel_de_read_fw(dev_priv, PIPE_WGC_C21_C20(pipe));
656+
tmp = intel_de_read_fw(dev_priv, PIPE_WGC_C21_C20(dev_priv, pipe));
657657
csc->coeff[6] = tmp & 0xffff;
658658
csc->coeff[7] = tmp >> 16;
659659

drivers/gpu/drm/i915/display/intel_color_regs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@
260260
#define PIPE_WGC_C02(dev_priv, pipe) _MMIO_TRANS2(dev_priv, pipe, _PIPE_A_WGC_C02)
261261
#define PIPE_WGC_C11_C10(dev_priv, pipe) _MMIO_TRANS2(dev_priv, pipe, _PIPE_A_WGC_C11_C10)
262262
#define PIPE_WGC_C12(dev_priv, pipe) _MMIO_TRANS2(dev_priv, pipe, _PIPE_A_WGC_C12)
263-
#define PIPE_WGC_C21_C20(pipe) _MMIO_TRANS2(dev_priv, pipe, _PIPE_A_WGC_C21_C20)
263+
#define PIPE_WGC_C21_C20(dev_priv, pipe) _MMIO_TRANS2(dev_priv, pipe, _PIPE_A_WGC_C21_C20)
264264
#define PIPE_WGC_C22(pipe) _MMIO_TRANS2(dev_priv, pipe, _PIPE_A_WGC_C22)
265265

266266
/* pipe CSC & degamma/gamma LUTs on CHV */

0 commit comments

Comments
 (0)