References to struct drm_device.pdev should not be used any longer as the field will be moved into the struct's legacy section. Add a fix for the rsp commit.
v2: * fix an error in the commit description (Michael)
Signed-off-by: Thomas Zimmermann tzimmermann@suse.de Reviewed-by: Jani Nikula jani.nikula@intel.com 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;
-----Original Message----- From: Thomas Zimmermann tzimmermann@suse.de Sent: Tuesday, April 27, 2021 1:49 PM 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; Ruhl, Michael J michael.j.ruhl@intel.com Cc: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; Thomas Zimmermann tzimmermann@suse.de; Nikula, Jani jani.nikula@intel.com; Tang, CQ cq.tang@intel.com; Tvrtko Ursulin tvrtko.ursulin@linux.intel.com; Liu, Xinyun xinyun.liu@intel.com; Ursulin, Tvrtko tvrtko.ursulin@intel.com; Chris Wilson chris@chris-wilson.co.uk; Mika Kuoppala mika.kuoppala@linux.intel.com; Daniel Vetter daniel.vetter@ffwll.ch; Maarten Lankhorst maarten.lankhorst@linux.intel.com; Hellstrom, Thomas thomas.hellstrom@intel.com; Gustavo A. R. Silva gustavoars@kernel.org; Dan Carpenter dan.carpenter@oracle.com Subject: [PATCH v2] drm/i915/gem: Remove reference to struct drm_device.pdev
References to struct drm_device.pdev should not be used any longer as the field will be moved into the struct's legacy section. Add a fix for the rsp commit.
Commit message match the patch.
Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com
M
v2:
- fix an error in the commit description (Michael)
Signed-off-by: Thomas Zimmermann tzimmermann@suse.de Reviewed-by: Jani Nikula jani.nikula@intel.com 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
On Tue, 27 Apr 2021, "Ruhl, Michael J" michael.j.ruhl@intel.com wrote:
-----Original Message----- From: Thomas Zimmermann tzimmermann@suse.de Sent: Tuesday, April 27, 2021 1:49 PM 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; Ruhl, Michael J michael.j.ruhl@intel.com Cc: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; Thomas Zimmermann tzimmermann@suse.de; Nikula, Jani jani.nikula@intel.com; Tang, CQ cq.tang@intel.com; Tvrtko Ursulin tvrtko.ursulin@linux.intel.com; Liu, Xinyun xinyun.liu@intel.com; Ursulin, Tvrtko tvrtko.ursulin@intel.com; Chris Wilson chris@chris-wilson.co.uk; Mika Kuoppala mika.kuoppala@linux.intel.com; Daniel Vetter daniel.vetter@ffwll.ch; Maarten Lankhorst maarten.lankhorst@linux.intel.com; Hellstrom, Thomas thomas.hellstrom@intel.com; Gustavo A. R. Silva gustavoars@kernel.org; Dan Carpenter dan.carpenter@oracle.com Subject: [PATCH v2] drm/i915/gem: Remove reference to struct drm_device.pdev
References to struct drm_device.pdev should not be used any longer as the field will be moved into the struct's legacy section. Add a fix for the rsp commit.
Commit message match the patch.
Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com
Thanks for the patch and review, pushed to drm-intel-gt-next.
BR, Jani.
M
v2:
- fix an error in the commit description (Michael)
Signed-off-by: Thomas Zimmermann tzimmermann@suse.de Reviewed-by: Jani Nikula jani.nikula@intel.com 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@lists.freedesktop.org
-
Jani Nikula -
Ruhl, Michael J -
Thomas Zimmermann