2024-01-31 20:48:23

by Paz Zcharya

[permalink] [raw]
Subject: [PATCH] drm/i915/display: Include debugfs.h in intel_display_debugfs_params.c

Commit 8015bee0bfec ("drm/i915/display: Add framework to add parameters
specific to display") added the file intel_display_debugfs_params.c,
which calls the functions "debugfs_create_{bool, ulong, str}" -- all of
which are defined in <linux/debugfs.h>. The missing inclusion of this
header file is breaking the ChromeOS build -- add an explicit include
to fix that.

Signed-off-by: Paz Zcharya <[email protected]>
---
drivers/gpu/drm/i915/display/intel_display_debugfs_params.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c b/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c
index b7e68eb62452..f35718748555 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c
@@ -3,6 +3,7 @@
* Copyright © 2023 Intel Corporation
*/

+#include <linux/debugfs.h>
#include <linux/kernel.h>

#include <drm/drm_drv.h>
--
2.43.0.594.gd9cf4e227d-goog



2024-02-01 09:23:33

by Jani Nikula

[permalink] [raw]
Subject: Re: [PATCH] drm/i915/display: Include debugfs.h in intel_display_debugfs_params.c

On Wed, 31 Jan 2024, Paz Zcharya <[email protected]> wrote:
> Commit 8015bee0bfec ("drm/i915/display: Add framework to add parameters
> specific to display") added the file intel_display_debugfs_params.c,
> which calls the functions "debugfs_create_{bool, ulong, str}" -- all of
> which are defined in <linux/debugfs.h>. The missing inclusion of this
> header file is breaking the ChromeOS build -- add an explicit include
> to fix that.
>

Thanks for the patch, apparently in our configs some paths lead to
debugfs.h. Just goes on to show how interdependent the kernel headers
are.

Out of curiousity, what value do you have for CONFIG_DEBUG_FS kconfig?

Fixes: 8015bee0bfec ("drm/i915/display: Add framework to add parameters specific to display")
Reviewed-by: Jani Nikula <[email protected]>

BR,
Jani.


> Signed-off-by: Paz Zcharya <[email protected]>
> ---
> drivers/gpu/drm/i915/display/intel_display_debugfs_params.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c b/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c
> index b7e68eb62452..f35718748555 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c
> @@ -3,6 +3,7 @@
> * Copyright © 2023 Intel Corporation
> */
>
> +#include <linux/debugfs.h>
> #include <linux/kernel.h>
>
> #include <drm/drm_drv.h>

--
Jani Nikula, Intel

2024-02-01 15:19:24

by Jani Nikula

[permalink] [raw]
Subject: Re: [PATCH] drm/i915/display: Include debugfs.h in intel_display_debugfs_params.c

On Thu, 01 Feb 2024, Paz Zcharya <[email protected]> wrote:
> Thank you so much for the super prompt reply!

FYI, looks like we've got some hiccup in CI, will merge after we get
results.

BR,
Jani.


--
Jani Nikula, Intel

2024-02-01 15:20:52

by Paz Zcharya

[permalink] [raw]
Subject: Re: [PATCH] drm/i915/display: Include debugfs.h in intel_display_debugfs_params.c

On Thu, Feb 01, 2024 at 11:22:16AM +0200, Jani Nikula wrote:
> On Wed, 31 Jan 2024, Paz Zcharya <[email protected]> wrote:
> > Commit 8015bee0bfec ("drm/i915/display: Add framework to add parameters
> > specific to display") added the file intel_display_debugfs_params.c,
> > which calls the functions "debugfs_create_{bool, ulong, str}" -- all of
> > which are defined in <linux/debugfs.h>. The missing inclusion of this
> > header file is breaking the ChromeOS build -- add an explicit include
> > to fix that.
> >
>
> Thanks for the patch, apparently in our configs some paths lead to
> debugfs.h. Just goes on to show how interdependent the kernel headers
> are.
>
> Out of curiousity, what value do you have for CONFIG_DEBUG_FS kconfig?
>
> Fixes: 8015bee0bfec ("drm/i915/display: Add framework to add parameters specific to display")
> Reviewed-by: Jani Nikula <[email protected]>
>
> BR,
> Jani.
>
Thank you so much for the super prompt reply!

In ChromeOS the value is CONFIG_DEBUG_FS=y.

Best,
Paz
>
> > Signed-off-by: Paz Zcharya <[email protected]>
> > ---
> > drivers/gpu/drm/i915/display/intel_display_debugfs_params.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c b/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c
> > index b7e68eb62452..f35718748555 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c
> > @@ -3,6 +3,7 @@
> > * Copyright © 2023 Intel Corporation
> > */
> >
> > +#include <linux/debugfs.h>
> > #include <linux/kernel.h>
> >
> > #include <drm/drm_drv.h>
>
> --
> Jani Nikula, Intel

2024-02-02 09:37:30

by Jani Nikula

[permalink] [raw]
Subject: Re: [PATCH] drm/i915/display: Include debugfs.h in intel_display_debugfs_params.c

On Thu, 01 Feb 2024, Jani Nikula <[email protected]> wrote:
> On Thu, 01 Feb 2024, Paz Zcharya <[email protected]> wrote:
>> Thank you so much for the super prompt reply!
>
> FYI, looks like we've got some hiccup in CI, will merge after we get
> results.

Pushed to drm-intel-next, thanks for the patch.

BR,
Jani.

--
Jani Nikula, Intel