intel-iommu.h is not needed in drm/i915 anymore. Remove its include.
Signed-off-by: Lu Baolu <[email protected]>
---
drivers/gpu/drm/i915/i915_drv.h | 1 -
drivers/gpu/drm/i915/display/intel_display.c | 1 -
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 1 -
3 files changed, 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index fa14da84362e..f2a6982c3bef 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -36,7 +36,6 @@
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
-#include <linux/intel-iommu.h>
#include <linux/pm_qos.h>
#include <drm/drm_connector.h>
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 7dfeb458aa65..686ddbeebadc 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -27,7 +27,6 @@
#include <acpi/video.h>
#include <linux/i2c.h>
#include <linux/input.h>
-#include <linux/intel-iommu.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/dma-resv.h>
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index d42f437149c9..c9823528ea94 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -4,7 +4,6 @@
* Copyright © 2008,2010 Intel Corporation
*/
-#include <linux/intel-iommu.h>
#include <linux/dma-resv.h>
#include <linux/sync_file.h>
#include <linux/uaccess.h>
--
2.25.1
On Sat, 14 May 2022, Lu Baolu <[email protected]> wrote:
> intel-iommu.h is not needed in drm/i915 anymore. Remove its include.
Thanks for the cleanups. Do you want to keep the patches together or
want us to pick this up via drm-intel?
If you want to keep the patches together,
Acked-by: Jani Nikula <[email protected]>
for merging via whichever tree suits you best. Just let us know.
BR,
Jani.
>
> Signed-off-by: Lu Baolu <[email protected]>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 1 -
> drivers/gpu/drm/i915/display/intel_display.c | 1 -
> drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 1 -
> 3 files changed, 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index fa14da84362e..f2a6982c3bef 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -36,7 +36,6 @@
>
> #include <linux/i2c.h>
> #include <linux/i2c-algo-bit.h>
> -#include <linux/intel-iommu.h>
> #include <linux/pm_qos.h>
>
> #include <drm/drm_connector.h>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 7dfeb458aa65..686ddbeebadc 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -27,7 +27,6 @@
> #include <acpi/video.h>
> #include <linux/i2c.h>
> #include <linux/input.h>
> -#include <linux/intel-iommu.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/dma-resv.h>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> index d42f437149c9..c9823528ea94 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> @@ -4,7 +4,6 @@
> * Copyright © 2008,2010 Intel Corporation
> */
>
> -#include <linux/intel-iommu.h>
> #include <linux/dma-resv.h>
> #include <linux/sync_file.h>
> #include <linux/uaccess.h>
--
Jani Nikula, Intel Open Source Graphics Center
On Sat, May 14, 2022 at 09:43:19AM +0800, Lu Baolu wrote:
> intel-iommu.h is not needed in drm/i915 anymore. Remove its include.
>
> Signed-off-by: Lu Baolu <[email protected]>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 1 -
> drivers/gpu/drm/i915/display/intel_display.c | 1 -
> drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 1 -
> 3 files changed, 3 deletions(-)
Reviewed-by: Jason Gunthorpe <[email protected]>
Jason