Skip to content

Commit 10f9175

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

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
@@ -616,7 +616,7 @@ static void vlv_load_wgc_csc(struct intel_crtc *crtc,
616616
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
617617
enum pipe pipe = crtc->pipe;
618618

619-
intel_de_write_fw(dev_priv, PIPE_WGC_C01_C00(pipe),
619+
intel_de_write_fw(dev_priv, PIPE_WGC_C01_C00(dev_priv, pipe),
620620
csc->coeff[1] << 16 | csc->coeff[0]);
621621
intel_de_write_fw(dev_priv, PIPE_WGC_C02(pipe),
622622
csc->coeff[2]);
@@ -639,7 +639,7 @@ static void vlv_read_wgc_csc(struct intel_crtc *crtc,
639639
enum pipe pipe = crtc->pipe;
640640
u32 tmp;
641641

642-
tmp = intel_de_read_fw(dev_priv, PIPE_WGC_C01_C00(pipe));
642+
tmp = intel_de_read_fw(dev_priv, PIPE_WGC_C01_C00(dev_priv, pipe));
643643
csc->coeff[0] = tmp & 0xffff;
644644
csc->coeff[1] = tmp >> 16;
645645

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

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

259-
#define PIPE_WGC_C01_C00(pipe) _MMIO_TRANS2(dev_priv, pipe, _PIPE_A_WGC_C01_C00)
259+
#define PIPE_WGC_C01_C00(dev_priv, pipe) _MMIO_TRANS2(dev_priv, pipe, _PIPE_A_WGC_C01_C00)
260260
#define PIPE_WGC_C02(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)

0 commit comments

Comments
 (0)