* [PATCH 1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks
@ 2022-03-11 10:06 Jani Nikula
2022-03-11 10:06 ` [PATCH 2/2] drm/i915: include uapi/drm/i915_drm.h directly where needed Jani Nikula
2022-03-11 16:21 ` [PATCH 1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks Bjorn Helgaas
0 siblings, 2 replies; 5+ messages in thread
From: Jani Nikula @ 2022-03-11 10:06 UTC (permalink / raw)
To: intel-gfx; +Cc: Bjorn Helgaas, linux-pci, x86, jani.nikula
early-quirks.c is the only user of drm/i915_drm.h that also needs
drm/i915_pciids.h. Include the masses of PCI ID macros only where
needed.
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
Cc: x86@kernel.org
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
I'm hoping to merge this via drm-intel with the other patch.
---
arch/x86/kernel/early-quirks.c | 1 +
include/drm/i915_drm.h | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index bd6dad83c65b..805596736e20 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -18,6 +18,7 @@
#include <linux/bcma/bcma_regs.h>
#include <linux/platform_data/x86/apple.h>
#include <drm/i915_drm.h>
+#include <drm/i915_pciids.h>
#include <asm/pci-direct.h>
#include <asm/dma.h>
#include <asm/io_apic.h>
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index 6722005884db..afbf3ef5643e 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -26,7 +26,6 @@
#ifndef _I915_DRM_H_
#define _I915_DRM_H_
-#include <drm/i915_pciids.h>
#include <uapi/drm/i915_drm.h>
/* For use by IPS driver */
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] drm/i915: include uapi/drm/i915_drm.h directly where needed
2022-03-11 10:06 [PATCH 1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks Jani Nikula
@ 2022-03-11 10:06 ` Jani Nikula
2022-03-17 17:50 ` [Intel-gfx] " Ville Syrjälä
2022-03-11 16:21 ` [PATCH 1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks Bjorn Helgaas
1 sibling, 1 reply; 5+ messages in thread
From: Jani Nikula @ 2022-03-11 10:06 UTC (permalink / raw)
To: intel-gfx; +Cc: Bjorn Helgaas, linux-pci, x86, jani.nikula
Remove the uapi/drm/i915_drm.h include from drm/i915_drm.h, and stop
being a proxy for uapi/drm/i915_drm.h. Include uapi/drm/i915_drm.h and
drm/i915_drm.h only where needed.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 2 ++
drivers/gpu/drm/i915/gem/i915_gem_region.c | 2 ++
drivers/gpu/drm/i915/intel_memory_region.c | 2 ++
drivers/gpu/drm/i915/intel_memory_region.h | 2 +-
drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 2 --
include/drm/i915_drm.h | 2 +-
6 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
index 444f8268b9c5..ede084f36ca9 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
@@ -3,6 +3,8 @@
* Copyright © 2019 Intel Corporation
*/
+#include <uapi/drm/i915_drm.h>
+
#include "intel_memory_region.h"
#include "gem/i915_gem_region.h"
#include "gem/i915_gem_lmem.h"
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_region.c b/drivers/gpu/drm/i915/gem/i915_gem_region.c
index c9b2e8b91053..f4fbae2f9dcc 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_region.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_region.c
@@ -3,6 +3,8 @@
* Copyright © 2019 Intel Corporation
*/
+#include <uapi/drm/i915_drm.h>
+
#include "intel_memory_region.h"
#include "i915_gem_region.h"
#include "i915_drv.h"
diff --git a/drivers/gpu/drm/i915/intel_memory_region.c b/drivers/gpu/drm/i915/intel_memory_region.c
index 1c841f68169a..ded78b83e0b5 100644
--- a/drivers/gpu/drm/i915/intel_memory_region.c
+++ b/drivers/gpu/drm/i915/intel_memory_region.c
@@ -5,6 +5,8 @@
#include <linux/prandom.h>
+#include <uapi/drm/i915_drm.h>
+
#include "intel_memory_region.h"
#include "i915_drv.h"
#include "i915_ttm_buddy_manager.h"
diff --git a/drivers/gpu/drm/i915/intel_memory_region.h b/drivers/gpu/drm/i915/intel_memory_region.h
index 21dcbd620758..bbc35ec5c090 100644
--- a/drivers/gpu/drm/i915/intel_memory_region.h
+++ b/drivers/gpu/drm/i915/intel_memory_region.h
@@ -10,7 +10,7 @@
#include <linux/mutex.h>
#include <linux/io-mapping.h>
#include <drm/drm_mm.h>
-#include <drm/i915_drm.h>
+#include <uapi/drm/i915_drm.h>
struct drm_i915_private;
struct drm_i915_gem_object;
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_session.c b/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
index 598840b73dfa..92b00b4de240 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
@@ -3,8 +3,6 @@
* Copyright(c) 2020, Intel Corporation. All rights reserved.
*/
-#include <drm/i915_drm.h>
-
#include "i915_drv.h"
#include "intel_pxp.h"
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index afbf3ef5643e..7adce327c1c2 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -26,7 +26,7 @@
#ifndef _I915_DRM_H_
#define _I915_DRM_H_
-#include <uapi/drm/i915_drm.h>
+#include <linux/types.h>
/* For use by IPS driver */
unsigned long i915_read_mch_val(void);
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks
2022-03-11 10:06 [PATCH 1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks Jani Nikula
2022-03-11 10:06 ` [PATCH 2/2] drm/i915: include uapi/drm/i915_drm.h directly where needed Jani Nikula
@ 2022-03-11 16:21 ` Bjorn Helgaas
1 sibling, 0 replies; 5+ messages in thread
From: Bjorn Helgaas @ 2022-03-11 16:21 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, Bjorn Helgaas, linux-pci, x86
On Fri, Mar 11, 2022 at 12:06:38PM +0200, Jani Nikula wrote:
> early-quirks.c is the only user of drm/i915_drm.h that also needs
> drm/i915_pciids.h. Include the masses of PCI ID macros only where
> needed.
>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: linux-pci@vger.kernel.org
> Cc: x86@kernel.org
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
FWIW:
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
>
> I'm hoping to merge this via drm-intel with the other patch.
> ---
> arch/x86/kernel/early-quirks.c | 1 +
> include/drm/i915_drm.h | 1 -
> 2 files changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
> index bd6dad83c65b..805596736e20 100644
> --- a/arch/x86/kernel/early-quirks.c
> +++ b/arch/x86/kernel/early-quirks.c
> @@ -18,6 +18,7 @@
> #include <linux/bcma/bcma_regs.h>
> #include <linux/platform_data/x86/apple.h>
> #include <drm/i915_drm.h>
> +#include <drm/i915_pciids.h>
> #include <asm/pci-direct.h>
> #include <asm/dma.h>
> #include <asm/io_apic.h>
> diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
> index 6722005884db..afbf3ef5643e 100644
> --- a/include/drm/i915_drm.h
> +++ b/include/drm/i915_drm.h
> @@ -26,7 +26,6 @@
> #ifndef _I915_DRM_H_
> #define _I915_DRM_H_
>
> -#include <drm/i915_pciids.h>
> #include <uapi/drm/i915_drm.h>
>
> /* For use by IPS driver */
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH 2/2] drm/i915: include uapi/drm/i915_drm.h directly where needed
2022-03-11 10:06 ` [PATCH 2/2] drm/i915: include uapi/drm/i915_drm.h directly where needed Jani Nikula
@ 2022-03-17 17:50 ` Ville Syrjälä
2022-03-17 18:23 ` Jani Nikula
0 siblings, 1 reply; 5+ messages in thread
From: Ville Syrjälä @ 2022-03-17 17:50 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, Bjorn Helgaas, linux-pci, x86
On Fri, Mar 11, 2022 at 12:06:39PM +0200, Jani Nikula wrote:
> Remove the uapi/drm/i915_drm.h include from drm/i915_drm.h, and stop
> being a proxy for uapi/drm/i915_drm.h. Include uapi/drm/i915_drm.h and
> drm/i915_drm.h only where needed.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Looks sensible to me. Series is
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 2 ++
> drivers/gpu/drm/i915/gem/i915_gem_region.c | 2 ++
> drivers/gpu/drm/i915/intel_memory_region.c | 2 ++
> drivers/gpu/drm/i915/intel_memory_region.h | 2 +-
> drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 2 --
> include/drm/i915_drm.h | 2 +-
> 6 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> index 444f8268b9c5..ede084f36ca9 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> @@ -3,6 +3,8 @@
> * Copyright © 2019 Intel Corporation
> */
>
> +#include <uapi/drm/i915_drm.h>
> +
> #include "intel_memory_region.h"
> #include "gem/i915_gem_region.h"
> #include "gem/i915_gem_lmem.h"
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_region.c b/drivers/gpu/drm/i915/gem/i915_gem_region.c
> index c9b2e8b91053..f4fbae2f9dcc 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_region.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_region.c
> @@ -3,6 +3,8 @@
> * Copyright © 2019 Intel Corporation
> */
>
> +#include <uapi/drm/i915_drm.h>
> +
> #include "intel_memory_region.h"
> #include "i915_gem_region.h"
> #include "i915_drv.h"
> diff --git a/drivers/gpu/drm/i915/intel_memory_region.c b/drivers/gpu/drm/i915/intel_memory_region.c
> index 1c841f68169a..ded78b83e0b5 100644
> --- a/drivers/gpu/drm/i915/intel_memory_region.c
> +++ b/drivers/gpu/drm/i915/intel_memory_region.c
> @@ -5,6 +5,8 @@
>
> #include <linux/prandom.h>
>
> +#include <uapi/drm/i915_drm.h>
> +
> #include "intel_memory_region.h"
> #include "i915_drv.h"
> #include "i915_ttm_buddy_manager.h"
> diff --git a/drivers/gpu/drm/i915/intel_memory_region.h b/drivers/gpu/drm/i915/intel_memory_region.h
> index 21dcbd620758..bbc35ec5c090 100644
> --- a/drivers/gpu/drm/i915/intel_memory_region.h
> +++ b/drivers/gpu/drm/i915/intel_memory_region.h
> @@ -10,7 +10,7 @@
> #include <linux/mutex.h>
> #include <linux/io-mapping.h>
> #include <drm/drm_mm.h>
> -#include <drm/i915_drm.h>
> +#include <uapi/drm/i915_drm.h>
>
> struct drm_i915_private;
> struct drm_i915_gem_object;
> diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_session.c b/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
> index 598840b73dfa..92b00b4de240 100644
> --- a/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
> +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
> @@ -3,8 +3,6 @@
> * Copyright(c) 2020, Intel Corporation. All rights reserved.
> */
>
> -#include <drm/i915_drm.h>
> -
> #include "i915_drv.h"
>
> #include "intel_pxp.h"
> diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
> index afbf3ef5643e..7adce327c1c2 100644
> --- a/include/drm/i915_drm.h
> +++ b/include/drm/i915_drm.h
> @@ -26,7 +26,7 @@
> #ifndef _I915_DRM_H_
> #define _I915_DRM_H_
>
> -#include <uapi/drm/i915_drm.h>
> +#include <linux/types.h>
>
> /* For use by IPS driver */
> unsigned long i915_read_mch_val(void);
> --
> 2.30.2
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH 2/2] drm/i915: include uapi/drm/i915_drm.h directly where needed
2022-03-17 17:50 ` [Intel-gfx] " Ville Syrjälä
@ 2022-03-17 18:23 ` Jani Nikula
0 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2022-03-17 18:23 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx, Bjorn Helgaas, linux-pci, x86
On Thu, 17 Mar 2022, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Fri, Mar 11, 2022 at 12:06:39PM +0200, Jani Nikula wrote:
>> Remove the uapi/drm/i915_drm.h include from drm/i915_drm.h, and stop
>> being a proxy for uapi/drm/i915_drm.h. Include uapi/drm/i915_drm.h and
>> drm/i915_drm.h only where needed.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Looks sensible to me. Series is
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Thanks for the review, pushed to drm-intel-next, with Bjorn's ack.
BR,
Jani.
>
>> ---
>> drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 2 ++
>> drivers/gpu/drm/i915/gem/i915_gem_region.c | 2 ++
>> drivers/gpu/drm/i915/intel_memory_region.c | 2 ++
>> drivers/gpu/drm/i915/intel_memory_region.h | 2 +-
>> drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 2 --
>> include/drm/i915_drm.h | 2 +-
>> 6 files changed, 8 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
>> index 444f8268b9c5..ede084f36ca9 100644
>> --- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
>> @@ -3,6 +3,8 @@
>> * Copyright © 2019 Intel Corporation
>> */
>>
>> +#include <uapi/drm/i915_drm.h>
>> +
>> #include "intel_memory_region.h"
>> #include "gem/i915_gem_region.h"
>> #include "gem/i915_gem_lmem.h"
>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_region.c b/drivers/gpu/drm/i915/gem/i915_gem_region.c
>> index c9b2e8b91053..f4fbae2f9dcc 100644
>> --- a/drivers/gpu/drm/i915/gem/i915_gem_region.c
>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_region.c
>> @@ -3,6 +3,8 @@
>> * Copyright © 2019 Intel Corporation
>> */
>>
>> +#include <uapi/drm/i915_drm.h>
>> +
>> #include "intel_memory_region.h"
>> #include "i915_gem_region.h"
>> #include "i915_drv.h"
>> diff --git a/drivers/gpu/drm/i915/intel_memory_region.c b/drivers/gpu/drm/i915/intel_memory_region.c
>> index 1c841f68169a..ded78b83e0b5 100644
>> --- a/drivers/gpu/drm/i915/intel_memory_region.c
>> +++ b/drivers/gpu/drm/i915/intel_memory_region.c
>> @@ -5,6 +5,8 @@
>>
>> #include <linux/prandom.h>
>>
>> +#include <uapi/drm/i915_drm.h>
>> +
>> #include "intel_memory_region.h"
>> #include "i915_drv.h"
>> #include "i915_ttm_buddy_manager.h"
>> diff --git a/drivers/gpu/drm/i915/intel_memory_region.h b/drivers/gpu/drm/i915/intel_memory_region.h
>> index 21dcbd620758..bbc35ec5c090 100644
>> --- a/drivers/gpu/drm/i915/intel_memory_region.h
>> +++ b/drivers/gpu/drm/i915/intel_memory_region.h
>> @@ -10,7 +10,7 @@
>> #include <linux/mutex.h>
>> #include <linux/io-mapping.h>
>> #include <drm/drm_mm.h>
>> -#include <drm/i915_drm.h>
>> +#include <uapi/drm/i915_drm.h>
>>
>> struct drm_i915_private;
>> struct drm_i915_gem_object;
>> diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_session.c b/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
>> index 598840b73dfa..92b00b4de240 100644
>> --- a/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
>> +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
>> @@ -3,8 +3,6 @@
>> * Copyright(c) 2020, Intel Corporation. All rights reserved.
>> */
>>
>> -#include <drm/i915_drm.h>
>> -
>> #include "i915_drv.h"
>>
>> #include "intel_pxp.h"
>> diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
>> index afbf3ef5643e..7adce327c1c2 100644
>> --- a/include/drm/i915_drm.h
>> +++ b/include/drm/i915_drm.h
>> @@ -26,7 +26,7 @@
>> #ifndef _I915_DRM_H_
>> #define _I915_DRM_H_
>>
>> -#include <uapi/drm/i915_drm.h>
>> +#include <linux/types.h>
>>
>> /* For use by IPS driver */
>> unsigned long i915_read_mch_val(void);
>> --
>> 2.30.2
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-03-17 18:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-11 10:06 [PATCH 1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks Jani Nikula
2022-03-11 10:06 ` [PATCH 2/2] drm/i915: include uapi/drm/i915_drm.h directly where needed Jani Nikula
2022-03-17 17:50 ` [Intel-gfx] " Ville Syrjälä
2022-03-17 18:23 ` Jani Nikula
2022-03-11 16:21 ` [PATCH 1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks Bjorn Helgaas
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).