Skip to content

Commit e4f0058

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

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
@@ -621,7 +621,7 @@ static void vlv_load_wgc_csc(struct intel_crtc *crtc,
621621
intel_de_write_fw(dev_priv, PIPE_WGC_C02(dev_priv, pipe),
622622
csc->coeff[2]);
623623

624-
intel_de_write_fw(dev_priv, PIPE_WGC_C11_C10(pipe),
624+
intel_de_write_fw(dev_priv, PIPE_WGC_C11_C10(dev_priv, pipe),
625625
csc->coeff[4] << 16 | csc->coeff[3]);
626626
intel_de_write_fw(dev_priv, PIPE_WGC_C12(pipe),
627627
csc->coeff[5]);
@@ -646,7 +646,7 @@ static void vlv_read_wgc_csc(struct intel_crtc *crtc,
646646
tmp = intel_de_read_fw(dev_priv, PIPE_WGC_C02(dev_priv, pipe));
647647
csc->coeff[2] = tmp & 0xffff;
648648

649-
tmp = intel_de_read_fw(dev_priv, PIPE_WGC_C11_C10(pipe));
649+
tmp = intel_de_read_fw(dev_priv, PIPE_WGC_C11_C10(dev_priv, pipe));
650650
csc->coeff[3] = tmp & 0xffff;
651651
csc->coeff[4] = tmp >> 16;
652652

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@
258258

259259
#define PIPE_WGC_C01_C00(dev_priv, pipe) _MMIO_TRANS2(dev_priv, pipe, _PIPE_A_WGC_C01_C00)
260260
#define PIPE_WGC_C02(dev_priv, pipe) _MMIO_TRANS2(dev_priv, pipe, _PIPE_A_WGC_C02)
261-
#define PIPE_WGC_C11_C10(pipe) _MMIO_TRANS2(dev_priv, pipe, _PIPE_A_WGC_C11_C10)
261+
#define PIPE_WGC_C11_C10(dev_priv, pipe) _MMIO_TRANS2(dev_priv, pipe, _PIPE_A_WGC_C11_C10)
262262
#define PIPE_WGC_C12(pipe) _MMIO_TRANS2(dev_priv, pipe, _PIPE_A_WGC_C12)
263263
#define PIPE_WGC_C21_C20(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)

0 commit comments

Comments
 (0)