| Message ID | 20210427110747.2065-1-tzimmermann@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/gem: Remove reference to struct drm_device.pdev | expand |
On Tue, 27 Apr 2021, Thomas Zimmermann <tzimmermann@suse.de> wrote: > References to struct drm_device.pdev should be used any longer as > the field will be moved into the struct's legacy section. Add a fix > for the rsp commit. > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > Fixes: d57d4a1daf5e ("drm/i915: Create stolen memory region from local memory") > Cc: CQ Tang <cq.tang@intel.com> > Cc: Matthew Auld <matthew.auld@intel.com> > Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> > Cc: Xinyun Liu <xinyun.liu@intel.com> > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > Cc: Jani Nikula <jani.nikula@linux.intel.com> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: "Thomas Hellström" <thomas.hellstrom@intel.com> > Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org> > Cc: Dan Carpenter <dan.carpenter@oracle.com> > Cc: intel-gfx@lists.freedesktop.org Reviewed-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c > index c5b64b2400e8..e1a32672bbe8 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c > @@ -773,7 +773,7 @@ struct intel_memory_region * > i915_gem_stolen_lmem_setup(struct drm_i915_private *i915) > { > struct intel_uncore *uncore = &i915->uncore; > - struct pci_dev *pdev = i915->drm.pdev; > + struct pci_dev *pdev = to_pci_dev(i915->drm.dev); > struct intel_memory_region *mem; > resource_size_t io_start; > resource_size_t lmem_size;
>-----Original Message----- >From: dri-devel <dri-devel-bounces@lists.freedesktop.org> On Behalf Of >Thomas Zimmermann >Sent: Tuesday, April 27, 2021 7:08 AM >To: jani.nikula@linux.intel.com; joonas.lahtinen@linux.intel.com; Vivi, Rodrigo ><rodrigo.vivi@intel.com>; airlied@linux.ie; daniel@ffwll.ch; Auld, Matthew ><matthew.auld@intel.com> >Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>; Ursulin, Tvrtko ><tvrtko.ursulin@intel.com>; Mika Kuoppala ><mika.kuoppala@linux.intel.com>; intel-gfx@lists.freedesktop.org; Gustavo >A. R. Silva <gustavoars@kernel.org>; dri-devel@lists.freedesktop.org; Chris >Wilson <chris@chris-wilson.co.uk>; Tang, CQ <cq.tang@intel.com>; Hellstrom, >Thomas <thomas.hellstrom@intel.com>; Thomas Zimmermann ><tzimmermann@suse.de>; Daniel Vetter <daniel.vetter@ffwll.ch>; Liu, >Xinyun <xinyun.liu@intel.com>; Dan Carpenter <dan.carpenter@oracle.com> >Subject: [PATCH] drm/i915/gem: Remove reference to struct >drm_device.pdev > >References to struct drm_device.pdev should be used any longer as should not be used ^^^ ? m >the field will be moved into the struct's legacy section. Add a fix >for the rsp commit. > >Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> >Fixes: d57d4a1daf5e ("drm/i915: Create stolen memory region from local >memory") >Cc: CQ Tang <cq.tang@intel.com> >Cc: Matthew Auld <matthew.auld@intel.com> >Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> >Cc: Xinyun Liu <xinyun.liu@intel.com> >Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> >Cc: Jani Nikula <jani.nikula@linux.intel.com> >Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> >Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> >Cc: Chris Wilson <chris@chris-wilson.co.uk> >Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> >Cc: Daniel Vetter <daniel.vetter@ffwll.ch> >Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> >Cc: "Thomas Hellström" <thomas.hellstrom@intel.com> >Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org> >Cc: Dan Carpenter <dan.carpenter@oracle.com> >Cc: intel-gfx@lists.freedesktop.org >--- > drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c >b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c >index c5b64b2400e8..e1a32672bbe8 100644 >--- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c >+++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c >@@ -773,7 +773,7 @@ struct intel_memory_region * > i915_gem_stolen_lmem_setup(struct drm_i915_private *i915) > { > struct intel_uncore *uncore = &i915->uncore; >- struct pci_dev *pdev = i915->drm.pdev; >+ struct pci_dev *pdev = to_pci_dev(i915->drm.dev); > struct intel_memory_region *mem; > resource_size_t io_start; > resource_size_t lmem_size; >-- >2.31.1 > >_______________________________________________ >dri-devel mailing list >dri-devel@lists.freedesktop.org >https://lists.freedesktop.org/mailman/listinfo/dri-devel
Am 27.04.21 um 16:39 schrieb Ruhl, Michael J: > >> -----Original Message----- >> From: dri-devel <dri-devel-bounces@lists.freedesktop.org> On Behalf Of >> Thomas Zimmermann >> Sent: Tuesday, April 27, 2021 7:08 AM >> To: jani.nikula@linux.intel.com; joonas.lahtinen@linux.intel.com; Vivi, Rodrigo >> <rodrigo.vivi@intel.com>; airlied@linux.ie; daniel@ffwll.ch; Auld, Matthew >> <matthew.auld@intel.com> >> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>; Ursulin, Tvrtko >> <tvrtko.ursulin@intel.com>; Mika Kuoppala >> <mika.kuoppala@linux.intel.com>; intel-gfx@lists.freedesktop.org; Gustavo >> A. R. Silva <gustavoars@kernel.org>; dri-devel@lists.freedesktop.org; Chris >> Wilson <chris@chris-wilson.co.uk>; Tang, CQ <cq.tang@intel.com>; Hellstrom, >> Thomas <thomas.hellstrom@intel.com>; Thomas Zimmermann >> <tzimmermann@suse.de>; Daniel Vetter <daniel.vetter@ffwll.ch>; Liu, >> Xinyun <xinyun.liu@intel.com>; Dan Carpenter <dan.carpenter@oracle.com> >> Subject: [PATCH] drm/i915/gem: Remove reference to struct >> drm_device.pdev >> >> References to struct drm_device.pdev should be used any longer as > > should not be used > ^^^ > ? Oh, indeed. > > m > >> the field will be moved into the struct's legacy section. Add a fix >> for the rsp commit. >> >> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> >> Fixes: d57d4a1daf5e ("drm/i915: Create stolen memory region from local >> memory") >> Cc: CQ Tang <cq.tang@intel.com> >> Cc: Matthew Auld <matthew.auld@intel.com> >> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> >> Cc: Xinyun Liu <xinyun.liu@intel.com> >> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> >> Cc: Jani Nikula <jani.nikula@linux.intel.com> >> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> >> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> >> Cc: Chris Wilson <chris@chris-wilson.co.uk> >> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> >> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> >> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> >> Cc: "Thomas Hellström" <thomas.hellstrom@intel.com> >> Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org> >> Cc: Dan Carpenter <dan.carpenter@oracle.com> >> Cc: intel-gfx@lists.freedesktop.org >> --- >> drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c >> b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c >> index c5b64b2400e8..e1a32672bbe8 100644 >> --- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c >> +++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c >> @@ -773,7 +773,7 @@ struct intel_memory_region * >> i915_gem_stolen_lmem_setup(struct drm_i915_private *i915) >> { >> struct intel_uncore *uncore = &i915->uncore; >> - struct pci_dev *pdev = i915->drm.pdev; >> + struct pci_dev *pdev = to_pci_dev(i915->drm.dev); >> struct intel_memory_region *mem; >> resource_size_t io_start; >> resource_size_t lmem_size; >> -- >> 2.31.1 >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel >
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c index c5b64b2400e8..e1a32672bbe8 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c @@ -773,7 +773,7 @@ struct intel_memory_region * i915_gem_stolen_lmem_setup(struct drm_i915_private *i915) { struct intel_uncore *uncore = &i915->uncore; - struct pci_dev *pdev = i915->drm.pdev; + struct pci_dev *pdev = to_pci_dev(i915->drm.dev); struct intel_memory_region *mem; resource_size_t io_start; resource_size_t lmem_size;
References to struct drm_device.pdev should be used any longer as the field will be moved into the struct's legacy section. Add a fix for the rsp commit. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Fixes: d57d4a1daf5e ("drm/i915: Create stolen memory region from local memory") Cc: CQ Tang <cq.tang@intel.com> Cc: Matthew Auld <matthew.auld@intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> Cc: Xinyun Liu <xinyun.liu@intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: "Thomas Hellström" <thomas.hellstrom@intel.com> Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org> Cc: Dan Carpenter <dan.carpenter@oracle.com> Cc: intel-gfx@lists.freedesktop.org --- drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)