| Message ID | 20220311100639.114685-1-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks | expand |
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 >
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 */
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(-)