Nouveau - May 2021 - [PATCH 3/3] drm: Don't include drm_legacy.h in drm_lease.c

Remove include statements for DRM legacy headers. None of these
dependencies is required. Built-tested w/o CONFIG_DRM_LEGACY set.

These patches should probably go through drm-misc, like the rest
of the legacy cleanups.

Thomas Zimmermann (3):
  drm/i915: Don't include drm_legacy.h
  drm/nouveau: Don't include drm_legacy.h
  drm: Don't include drm_legacy.h in drm_lease.c

 drivers/gpu/drm/drm_lease.c              | 1 -
 drivers/gpu/drm/i915/gem/i915_gem_phys.c | 1 -
 drivers/gpu/drm/i915/i915_drv.h          | 1 -
 drivers/gpu/drm/nouveau/nouveau_ttm.c    | 2 --
 4 files changed, 5 deletions(-)


base-commit: 77fc6f68ed347b0a4c6969f6adac70026d5b1449
prerequisite-patch-id: c2b2f08f0eccc9f5df0c0da49fa1d36267deb11d
prerequisite-patch-id: c67e5d886a47b7d0266d81100837557fda34cb24
prerequisite-patch-id: c59ca2ddb182af06006fa360ad3e90fe16b93d3a
prerequisite-patch-id: 8c45deec68d6ab65d66f551b51b12acf2e9ae0b4
prerequisite-patch-id: 742f08083f0d5776068a761b1e2432e8edc2bdf8
prerequisite-patch-id: 39cfaf5f337ec53d3237bf2a700e77c84f789039
--
2.31.1

i915 does not use DRM legacy code. Remove the rsp include statements.

Signed-off-by: Thomas Zimmermann <tzimmermann at suse.de>
---
 drivers/gpu/drm/i915/gem/i915_gem_phys.c | 1 -
 drivers/gpu/drm/i915/i915_drv.h          | 1 -
 2 files changed, 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_phys.c
b/drivers/gpu/drm/i915/gem/i915_gem_phys.c
index 81dc2bf59bc3..51a05e62875d 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_phys.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_phys.c
@@ -8,7 +8,6 @@
 #include <linux/shmem_fs.h>
 #include <linux/swap.h>
 
-#include <drm/drm.h> /* for drm_legacy.h! */
 #include <drm/drm_cache.h>
 
 #include "gt/intel_gt.h"
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 61308ce19059..bcc6f0133150 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -51,7 +51,6 @@
 #include <linux/xarray.h>
 
 #include <drm/intel-gtt.h>
-#include <drm/drm_legacy.h> /* for struct drm_dma_handle */
 #include <drm/drm_gem.h>
 #include <drm/drm_auth.h>
 #include <drm/drm_cache.h>
-- 
2.31.1

Nouveau does not use DRM legacy code. Remove the rsp. include
statement.

Signed-off-by: Thomas Zimmermann <tzimmermann at suse.de>
---
 drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c
b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index e8b506a6685b..468eacb41f05 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
@@ -31,8 +31,6 @@
 #include "nouveau_mem.h"
 #include "nouveau_ttm.h"
 
-#include <drm/drm_legacy.h>
-
 #include <core/tegra.h>
 
 static void
-- 
2.31.1

DRM leases do not use DRM legacy code. Remove the rsp include
statement.

Signed-off-by: Thomas Zimmermann <tzimmermann at suse.de>
---
 drivers/gpu/drm/drm_lease.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c
index da4f085fc09e..00fb433bcef1 100644
--- a/drivers/gpu/drm/drm_lease.c
+++ b/drivers/gpu/drm/drm_lease.c
@@ -14,7 +14,6 @@
 
 #include "drm_crtc_internal.h"
 #include "drm_internal.h"
-#include "drm_legacy.h"
 
 #define drm_for_each_lessee(lessee, lessor) \
 	list_for_each_entry((lessee), &(lessor)->lessees, lessee_list)
-- 
2.31.1

On Sun, 16 May 2021, Thomas Zimmermann <tzimmermann at suse.de>
wrote:
> Remove include statements for DRM legacy headers. None of these
> dependencies is required. Built-tested w/o CONFIG_DRM_LEGACY set.
>
> These patches should probably go through drm-misc, like the rest
> of the legacy cleanups.
Acked-by: Jani Nikula <jani.nikula at intel.com>

>
> Thomas Zimmermann (3):
>   drm/i915: Don't include drm_legacy.h
>   drm/nouveau: Don't include drm_legacy.h
>   drm: Don't include drm_legacy.h in drm_lease.c
>
>  drivers/gpu/drm/drm_lease.c              | 1 -
>  drivers/gpu/drm/i915/gem/i915_gem_phys.c | 1 -
>  drivers/gpu/drm/i915/i915_drv.h          | 1 -
>  drivers/gpu/drm/nouveau/nouveau_ttm.c    | 2 --
>  4 files changed, 5 deletions(-)
>
>
> base-commit: 77fc6f68ed347b0a4c6969f6adac70026d5b1449
> prerequisite-patch-id: c2b2f08f0eccc9f5df0c0da49fa1d36267deb11d
> prerequisite-patch-id: c67e5d886a47b7d0266d81100837557fda34cb24
> prerequisite-patch-id: c59ca2ddb182af06006fa360ad3e90fe16b93d3a
> prerequisite-patch-id: 8c45deec68d6ab65d66f551b51b12acf2e9ae0b4
> prerequisite-patch-id: 742f08083f0d5776068a761b1e2432e8edc2bdf8
> prerequisite-patch-id: 39cfaf5f337ec53d3237bf2a700e77c84f789039
> --
> 2.31.1
>
-- 
Jani Nikula, Intel Open Source Graphics Center