Skip to content

Commit 1014793

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

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
@@ -628,7 +628,7 @@ static void vlv_load_wgc_csc(struct intel_crtc *crtc,
628628

629629
intel_de_write_fw(dev_priv, PIPE_WGC_C21_C20(dev_priv, pipe),
630630
csc->coeff[7] << 16 | csc->coeff[6]);
631-
intel_de_write_fw(dev_priv, PIPE_WGC_C22(pipe),
631+
intel_de_write_fw(dev_priv, PIPE_WGC_C22(dev_priv, pipe),
632632
csc->coeff[8]);
633633
}
634634

@@ -657,7 +657,7 @@ static void vlv_read_wgc_csc(struct intel_crtc *crtc,
657657
csc->coeff[6] = tmp & 0xffff;
658658
csc->coeff[7] = tmp >> 16;
659659

660-
tmp = intel_de_read_fw(dev_priv, PIPE_WGC_C22(pipe));
660+
tmp = intel_de_read_fw(dev_priv, PIPE_WGC_C22(dev_priv, pipe));
661661
csc->coeff[8] = tmp & 0xffff;
662662
}
663663

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@
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)
263263
#define PIPE_WGC_C21_C20(dev_priv, pipe) _MMIO_TRANS2(dev_priv, pipe, _PIPE_A_WGC_C21_C20)
264-
#define PIPE_WGC_C22(pipe) _MMIO_TRANS2(dev_priv, pipe, _PIPE_A_WGC_C22)
264+
#define PIPE_WGC_C22(dev_priv, pipe) _MMIO_TRANS2(dev_priv, pipe, _PIPE_A_WGC_C22)
265265

266266
/* pipe CSC & degamma/gamma LUTs on CHV */
267267
#define _CGM_PIPE_A_CSC_COEFF01 (VLV_DISPLAY_BASE + 0x67900)

0 commit comments

Comments
 (0)