Message ID | c2e90b608bd6f525c95f3350cf1661113a39360a.1717514638.git.jani.nikula@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/i915: finish the job of removing implicit dev_priv | expand |
On Tue, Jun 04, 2024 at 06:25:54PM +0300, Jani Nikula wrote: > Avoid the implicit dev_priv local variable use, and pass dev_priv > explicitly to the _PIPEBDSL register macro. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/i915_reg.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 2f942882e7ed..0a2111b0cd98 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -2296,7 +2296,7 @@ > #define SWF_ILK(i) _MMIO(0x4F000 + (i) * 4) > > /* Pipe B */ > -#define _PIPEBDSL (DISPLAY_MMIO_BASE(dev_priv) + 0x71000) > +#define _PIPEBDSL(dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71000) should we simply remove this reg for now, or one of those cases that are getting added as we speak? anyone to Cc here then? but up to you: Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > #define _TRANSBCONF (DISPLAY_MMIO_BASE(dev_priv) + 0x71008) > #define _PIPEBSTAT (DISPLAY_MMIO_BASE(dev_priv) + 0x71024) > #define _PIPEBFRAMEHIGH 0x71040 > -- > 2.39.2 >
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 2f942882e7ed..0a2111b0cd98 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -2296,7 +2296,7 @@ #define SWF_ILK(i) _MMIO(0x4F000 + (i) * 4) /* Pipe B */ -#define _PIPEBDSL (DISPLAY_MMIO_BASE(dev_priv) + 0x71000) +#define _PIPEBDSL(dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71000) #define _TRANSBCONF (DISPLAY_MMIO_BASE(dev_priv) + 0x71008) #define _PIPEBSTAT (DISPLAY_MMIO_BASE(dev_priv) + 0x71024) #define _PIPEBFRAMEHIGH 0x71040
Avoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the _PIPEBDSL register macro. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)