Skip to content

Commit 5af5a63

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

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

619619
intel_de_write_fw(dev_priv, PIPE_WGC_C01_C00(dev_priv, pipe),
620620
csc->coeff[1] << 16 | csc->coeff[0]);
621-
intel_de_write_fw(dev_priv, PIPE_WGC_C02(pipe),
621+
intel_de_write_fw(dev_priv, PIPE_WGC_C02(dev_priv, pipe),
622622
csc->coeff[2]);
623623

624624
intel_de_write_fw(dev_priv, PIPE_WGC_C11_C10(pipe),
@@ -643,7 +643,7 @@ static void vlv_read_wgc_csc(struct intel_crtc *crtc,
643643
csc->coeff[0] = tmp & 0xffff;
644644
csc->coeff[1] = tmp >> 16;
645645

646-
tmp = intel_de_read_fw(dev_priv, PIPE_WGC_C02(pipe));
646+
tmp = intel_de_read_fw(dev_priv, PIPE_WGC_C02(dev_priv, pipe));
647647
csc->coeff[2] = tmp & 0xffff;
648648

649649
tmp = intel_de_read_fw(dev_priv, PIPE_WGC_C11_C10(pipe));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
#define _PIPE_A_WGC_C22 0x600C4 /* s2.10 */
258258

259259
#define PIPE_WGC_C01_C00(dev_priv, pipe) _MMIO_TRANS2(dev_priv, pipe, _PIPE_A_WGC_C01_C00)
260-
#define PIPE_WGC_C02(pipe) _MMIO_TRANS2(dev_priv, pipe, _PIPE_A_WGC_C02)
260+
#define PIPE_WGC_C02(dev_priv, pipe) _MMIO_TRANS2(dev_priv, pipe, _PIPE_A_WGC_C02)
261261
#define PIPE_WGC_C11_C10(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)

0 commit comments

Comments
 (0)