dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] drm/i915/gem: Remove reference to struct drm_device.pdev
@ 2021-04-27 11:07 Thomas Zimmermann
  2021-04-27 12:58 ` Jani Nikula
  2021-04-27 14:39 ` Ruhl, Michael J
  0 siblings, 2 replies; 4+ messages in thread
From: Thomas Zimmermann @ 2021-04-27 11:07 UTC (permalink / raw)
  To: jani.nikula, joonas.lahtinen, rodrigo.vivi, airlied, daniel,
	matthew.auld
  Cc: Tvrtko Ursulin, Tvrtko Ursulin, Mika Kuoppala, intel-gfx,
	Gustavo A. R. Silva, dri-devel, Chris Wilson, CQ Tang,
	Thomas Hellström, Thomas Zimmermann, Daniel Vetter,
	Xinyun Liu, Dan Carpenter

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(-)

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] drm/i915/gem: Remove reference to struct drm_device.pdev
  2021-04-27 11:07 [PATCH] drm/i915/gem: Remove reference to struct drm_device.pdev Thomas Zimmermann
@ 2021-04-27 12:58 ` Jani Nikula
  2021-04-27 14:39 ` Ruhl, Michael J
  1 sibling, 0 replies; 4+ messages in thread
From: Jani Nikula @ 2021-04-27 12:58 UTC (permalink / raw)
  To: Thomas Zimmermann, joonas.lahtinen, rodrigo.vivi, airlied,
	daniel, matthew.auld
  Cc: Tvrtko Ursulin, Tvrtko Ursulin, Mika Kuoppala, intel-gfx,
	Gustavo A. R. Silva, dri-devel, Chris Wilson, CQ Tang,
	Thomas Hellström, Thomas Zimmermann, Daniel Vetter,
	Xinyun Liu, Dan Carpenter

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;

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread

* RE: [PATCH] drm/i915/gem: Remove reference to struct drm_device.pdev
  2021-04-27 11:07 [PATCH] drm/i915/gem: Remove reference to struct drm_device.pdev Thomas Zimmermann
  2021-04-27 12:58 ` Jani Nikula
@ 2021-04-27 14:39 ` Ruhl, Michael J
  2021-04-27 17:46   ` Thomas Zimmermann
  1 sibling, 1 reply; 4+ messages in thread
From: Ruhl, Michael J @ 2021-04-27 14:39 UTC (permalink / raw)
  To: Thomas Zimmermann, jani.nikula, joonas.lahtinen, Vivi, Rodrigo,
	airlied, daniel, Auld, Matthew
  Cc: Tvrtko Ursulin, Ursulin, Tvrtko, Mika Kuoppala, intel-gfx,
	Gustavo A. R. Silva, dri-devel, Chris Wilson, Tang, CQ,
	Hellstrom, Thomas, Daniel Vetter, Liu,  Xinyun, Dan Carpenter


>-----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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] drm/i915/gem: Remove reference to struct drm_device.pdev
  2021-04-27 14:39 ` Ruhl, Michael J
@ 2021-04-27 17:46   ` Thomas Zimmermann
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Zimmermann @ 2021-04-27 17:46 UTC (permalink / raw)
  To: Ruhl, Michael J, jani.nikula, joonas.lahtinen, Vivi, Rodrigo,
	airlied, daniel, Auld, Matthew
  Cc: Tvrtko Ursulin, Ursulin, Tvrtko, Mika Kuoppala, intel-gfx,
	Gustavo A. R. Silva, dri-devel, Chris Wilson, Tang, CQ,
	Hellstrom, Thomas, Daniel Vetter, Liu, Xinyun, Dan Carpenter


[-- Attachment #1.1.1: Type: text/plain, Size: 3583 bytes --]



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
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-04-27 17:46 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-27 11:07 [PATCH] drm/i915/gem: Remove reference to struct drm_device.pdev Thomas Zimmermann
2021-04-27 12:58 ` Jani Nikula
2021-04-27 14:39 ` Ruhl, Michael J
2021-04-27 17:46   ` Thomas Zimmermann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).