| Message ID | fae5b3a14efab76ea4a549794512774659c36fc8.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:26:03PM +0300, Jani Nikula wrote: > Avoid the implicit dev_priv local variable use, and pass dev_priv > explicitly to the _DSPBSIZE 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 38c8b98d95c3..36ed23b93475 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -2312,7 +2312,7 @@ > #define _DSPBADDR(dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71184) > #define _DSPBSTRIDE(dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71188) > #define _DSPBPOS(dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x7118C) > -#define _DSPBSIZE (DISPLAY_MMIO_BASE(dev_priv) + 0x71190) > +#define _DSPBSIZE(dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71190) way too many unused cases... we should probably remove them all in one patch and whoever is introducing them later should already introduce with the dev_priv... but again, up to you Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > #define _DSPBSURF (DISPLAY_MMIO_BASE(dev_priv) + 0x7119C) > #define _DSPBTILEOFF (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4) > #define _DSPBOFFSET (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4) > -- > 2.39.2 >
On Thu, 06 Jun 2024, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote: > On Tue, Jun 04, 2024 at 06:26:03PM +0300, Jani Nikula wrote: >> Avoid the implicit dev_priv local variable use, and pass dev_priv >> explicitly to the _DSPBSIZE 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 38c8b98d95c3..36ed23b93475 100644 >> --- a/drivers/gpu/drm/i915/i915_reg.h >> +++ b/drivers/gpu/drm/i915/i915_reg.h >> @@ -2312,7 +2312,7 @@ >> #define _DSPBADDR(dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71184) >> #define _DSPBSTRIDE(dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71188) >> #define _DSPBPOS(dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x7118C) >> -#define _DSPBSIZE (DISPLAY_MMIO_BASE(dev_priv) + 0x71190) >> +#define _DSPBSIZE(dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71190) > > way too many unused cases... > we should probably remove them all in one patch and whoever is introducing them > later should already introduce with the dev_priv... > > but again, up to you > > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Dropped the changes touching unused macros, and pushed everything else to din. I've got a separate series cleaning up gvt a bit and removing the unused ones. Thanks for the review! BR, Jani. > > >> #define _DSPBSURF (DISPLAY_MMIO_BASE(dev_priv) + 0x7119C) >> #define _DSPBTILEOFF (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4) >> #define _DSPBOFFSET (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4) >> -- >> 2.39.2 >>
On Fri, 07 Jun 2024, Jani Nikula <jani.nikula@intel.com> wrote: > On Thu, 06 Jun 2024, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote: >> On Tue, Jun 04, 2024 at 06:26:03PM +0300, Jani Nikula wrote: >>> Avoid the implicit dev_priv local variable use, and pass dev_priv >>> explicitly to the _DSPBSIZE 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 38c8b98d95c3..36ed23b93475 100644 >>> --- a/drivers/gpu/drm/i915/i915_reg.h >>> +++ b/drivers/gpu/drm/i915/i915_reg.h >>> @@ -2312,7 +2312,7 @@ >>> #define _DSPBADDR(dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71184) >>> #define _DSPBSTRIDE(dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71188) >>> #define _DSPBPOS(dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x7118C) >>> -#define _DSPBSIZE (DISPLAY_MMIO_BASE(dev_priv) + 0x71190) >>> +#define _DSPBSIZE(dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71190) >> >> way too many unused cases... >> we should probably remove them all in one patch and whoever is introducing them >> later should already introduce with the dev_priv... >> >> but again, up to you >> >> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > Dropped the changes touching unused macros, and pushed everything else > to din. I've got a separate series cleaning up gvt a bit and removing > the unused ones. PS. Fixed a couple of whitespace issues while pushing. > > Thanks for the review! > > BR, > Jani. > > >> >> >>> #define _DSPBSURF (DISPLAY_MMIO_BASE(dev_priv) + 0x7119C) >>> #define _DSPBTILEOFF (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4) >>> #define _DSPBOFFSET (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4) >>> -- >>> 2.39.2 >>>
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 38c8b98d95c3..36ed23b93475 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -2312,7 +2312,7 @@ #define _DSPBADDR(dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71184) #define _DSPBSTRIDE(dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71188) #define _DSPBPOS(dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x7118C) -#define _DSPBSIZE (DISPLAY_MMIO_BASE(dev_priv) + 0x71190) +#define _DSPBSIZE(dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71190) #define _DSPBSURF (DISPLAY_MMIO_BASE(dev_priv) + 0x7119C) #define _DSPBTILEOFF (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4) #define _DSPBOFFSET (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4)
Avoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the _DSPBSIZE 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(-)