[PATCH v1 1/1] drm: Replace kernel.h with the necessary inclusions

Thomas Zimmermann tzimmermann at suse.de
Wed Nov 10 13:54:37 UTC 2021


Hi

Am 10.11.21 um 11:24 schrieb Andy Shevchenko:
> When kernel.h is used in the headers it adds a lot into dependency hell,
> especially when there are circular dependencies are involved.
> 
> Replace kernel.h inclusion with the list of what is really being used.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko at linux.intel.com>
> ---
>   include/drm/drm_gem_ttm_helper.h  | 2 +-
>   include/drm/drm_gem_vram_helper.h | 2 +-
>   include/drm/drm_mm.h              | 4 +++-
>   3 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/include/drm/drm_gem_ttm_helper.h b/include/drm/drm_gem_ttm_helper.h
> index c1aa02bd4c89..78040f6cc6f3 100644
> --- a/include/drm/drm_gem_ttm_helper.h
> +++ b/include/drm/drm_gem_ttm_helper.h
> @@ -3,7 +3,7 @@
>   #ifndef DRM_GEM_TTM_HELPER_H
>   #define DRM_GEM_TTM_HELPER_H
>   
> -#include <linux/kernel.h>
> +#include <linux/container_of.h>

I built this patch on a recent drm-misc-next, but there's no 
linux/container_of.h

Best regards
Thomas

>   
>   #include <drm/drm_device.h>
>   #include <drm/drm_gem.h>
> diff --git a/include/drm/drm_gem_vram_helper.h b/include/drm/drm_gem_vram_helper.h
> index d3cf06c9af65..b4ce27a72773 100644
> --- a/include/drm/drm_gem_vram_helper.h
> +++ b/include/drm/drm_gem_vram_helper.h
> @@ -11,8 +11,8 @@
>   #include <drm/ttm/ttm_bo_api.h>
>   #include <drm/ttm/ttm_bo_driver.h>
>   
> +#include <linux/container_of.h>
>   #include <linux/dma-buf-map.h>
> -#include <linux/kernel.h> /* for container_of() */
>   
>   struct drm_mode_create_dumb;
>   struct drm_plane;
> diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h
> index 9b4292f229c6..ac33ba1b18bc 100644
> --- a/include/drm/drm_mm.h
> +++ b/include/drm/drm_mm.h
> @@ -39,13 +39,15 @@
>    */
>   #include <linux/bug.h>
>   #include <linux/rbtree.h>
> -#include <linux/kernel.h>
> +#include <linux/limits.h>
>   #include <linux/mm_types.h>
>   #include <linux/list.h>
>   #include <linux/spinlock.h>
>   #ifdef CONFIG_DRM_DEBUG_MM
>   #include <linux/stackdepot.h>
>   #endif
> +#include <linux/types.h>
> +
>   #include <drm/drm_print.h>
>   
>   #ifdef CONFIG_DRM_DEBUG_MM
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20211110/8091c42f/attachment.sig>


More information about the dri-devel mailing list