2015-06-27 07:16:28

by Alexander Kuleshov

Subject: [PATCH] gpu/drm/amdgpu: Fix build when CONFIG_DEBUG_FS is not set

If the CONFIG_DEBUG_FS is not selected, compilation of the
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c provides two warnings that
amdgpu_debugfs_regs_init and amdgpu_debugfs_regs_cleanup are used but
never defined. And as result:

ERROR: "amdgpu_debugfs_regs_cleanup" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: "amdgpu_debugfs_regs_init" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
^

Signed-off-by: Alexander Kuleshov <[email protected]>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index fec487d..6896798 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2000,5 +2000,10 @@ int amdgpu_debugfs_init(struct drm_minor *minor)
void amdgpu_debugfs_cleanup(struct drm_minor *minor)
{
}
+#else
+static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev)
+{
+ return 0;
+}
+static void amdgpu_debugfs_regs_cleanup(struct amdgpu_device *adev) { }
#endif
--
2.4.4.410.gc71d752

2015-06-29 07:52:54

by Christian König

Subject: Re: [PATCH] gpu/drm/amdgpu: Fix build when CONFIG_DEBUG_FS is not set

On 27.06.2015 09:16, Alexander Kuleshov wrote:
> If the CONFIG_DEBUG_FS is not selected, compilation of the
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c provides two warnings that
> amdgpu_debugfs_regs_init and amdgpu_debugfs_regs_cleanup are used but
> never defined. And as result:
>
> ERROR: "amdgpu_debugfs_regs_cleanup" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
> ERROR: "amdgpu_debugfs_regs_init" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
> ^
>
> Signed-off-by: Alexander Kuleshov <[email protected]>

Reviewed-by: Christian König <[email protected]>

> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index fec487d..6896798 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -2000,5 +2000,10 @@ int amdgpu_debugfs_init(struct drm_minor *minor)
> void amdgpu_debugfs_cleanup(struct drm_minor *minor)
> {
> }
> +#else
> +static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev)
> +{
> + return 0;
> +}
> +static void amdgpu_debugfs_regs_cleanup(struct amdgpu_device *adev) { }
> #endif
> --
> 2.4.4.410.gc71d752
>
> _______________________________________________
> dri-devel mailing list
> [email protected]
> http://lists.freedesktop.org/mailman/listinfo/dri-devel