[PATCH] drm: Include <asm/agp.h> iff CONFIG_AGP is set

[PATCH] drm: Include <asm/agp.h> iff CONFIG_AGP is set

[Thomas Zimmermann]

Platforms without AGP don't provide the AGP header. Only include it
if CONFIG_AGP is set.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.
Fixes: 04dfe19a5ed6 ("drm: Mark AGP implementation and ioctls as legacy")
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Jason Yan <yanaijie@huawei.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: dri-devel@lists.freedesktop.org
---
 drivers/gpu/drm/drm_agpsupport.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c
index 07c10443770e..a4ad6fd13abc 100644
--- a/drivers/gpu/drm/drm_agpsupport.c
+++ b/drivers/gpu/drm/drm_agpsupport.c
@@ -35,7 +35,9 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
 
+#if IS_ENABLED(CONFIG_AGP)
 #include <asm/agp.h>
+#endif
 
 #include <drm/drm_device.h>
 #include <drm/drm_drv.h>
-- 
2.31.1

Re: [PATCH] drm: Include <asm/agp.h> iff CONFIG_AGP is set

[Alex Deucher]

On Mon, May 10, 2021 at 10:52 AM Thomas Zimmermann <tzimmermann@suse.de> wrote:
>
> Platforms without AGP don't provide the AGP header. Only include it
> if CONFIG_AGP is set.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.
> Fixes: 04dfe19a5ed6 ("drm: Mark AGP implementation and ioctls as legacy")
> Cc: Thomas Zimmermann <tzimmermann@suse.de>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: Christian König <christian.koenig@amd.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> Cc: Jason Yan <yanaijie@huawei.com>
> Cc: Lee Jones <lee.jones@linaro.org>
> Cc: Sam Ravnborg <sam@ravnborg.org>
> Cc: dri-devel@lists.freedesktop.org

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  drivers/gpu/drm/drm_agpsupport.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c
> index 07c10443770e..a4ad6fd13abc 100644
> --- a/drivers/gpu/drm/drm_agpsupport.c
> +++ b/drivers/gpu/drm/drm_agpsupport.c
> @@ -35,7 +35,9 @@
>  #include <linux/pci.h>
>  #include <linux/slab.h>
>
> +#if IS_ENABLED(CONFIG_AGP)
>  #include <asm/agp.h>
> +#endif
>
>  #include <drm/drm_device.h>
>  #include <drm/drm_drv.h>
> --
> 2.31.1
>