summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/display
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2024-06-04 17:25:39 +0200
committerJani Nikula <jani.nikula@intel.com>2024-06-07 10:13:18 +0200
commiteb3750ea338471b6e59b515d498fe2e3a5fbfd51 (patch)
tree87a0b123f86d48b74d29eaaeb3c4e887aa90bf4c /drivers/gpu/drm/i915/display
parentdrm/i915: pass dev_priv explicitly to PIPEFRAME (diff)
downloadlinux-eb3750ea338471b6e59b515d498fe2e3a5fbfd51.tar.xz
linux-eb3750ea338471b6e59b515d498fe2e3a5fbfd51.zip
drm/i915: pass dev_priv explicitly to PIPEFRAMEPIXEL
Avoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PIPEFRAMEPIXEL register macro. Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/464d4536f90e9d463458cdd315b3ba650e12ada5.1717514638.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/display')
-rw-r--r--drivers/gpu/drm/i915/display/intel_vblank.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_vblank.c b/drivers/gpu/drm/i915/display/intel_vblank.c
index aa1cd8b6c547..f2eb3bc65203 100644
--- a/drivers/gpu/drm/i915/display/intel_vblank.c
+++ b/drivers/gpu/drm/i915/display/intel_vblank.c
@@ -103,7 +103,7 @@ u32 i915_get_vblank_counter(struct drm_crtc *crtc)
* we get a low value that's stable across two reads of the high
* register.
*/
- frame = intel_de_read64_2x32(dev_priv, PIPEFRAMEPIXEL(pipe),
+ frame = intel_de_read64_2x32(dev_priv, PIPEFRAMEPIXEL(dev_priv, pipe),
PIPEFRAME(dev_priv, pipe));
pixel = frame & PIPE_PIXEL_MASK;
@@ -387,7 +387,7 @@ static bool i915_get_crtc_scanoutpos(struct drm_crtc *_crtc,
* We can split this into vertical and horizontal
* scanout position.
*/
- position = (intel_de_read_fw(dev_priv, PIPEFRAMEPIXEL(pipe)) & PIPE_PIXEL_MASK) >> PIPE_PIXEL_SHIFT;
+ position = (intel_de_read_fw(dev_priv, PIPEFRAMEPIXEL(dev_priv, pipe)) & PIPE_PIXEL_MASK) >> PIPE_PIXEL_SHIFT;
/* convert to pixel counts */
vbl_start *= htotal;