[PATCH 1/2] drm: Always include the debugfs dentry in drm_crtc

Jani Nikula jani.nikula at intel.com
Wed Dec 22 08:11:36 UTC 2021


On Tue, 21 Dec 2021, Ville Syrjala <ville.syrjala at linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> Remove the counterproductive CONFIG_DEBUG_FS ifdef and just include
> the debugfs dentry in drm_crtc always. This way we don't need
> annoying ifdefs in the actual code with DEBUGFS=n. Also we don't
> have these ifdefs around any of the other debugfs dentries either
> so can't see why drm_crtc should be special.
>
> This fixes the i915 DEBUGFS=n build because I assumed the dentry
> would always be there.

Reviewed-by: Jani Nikula <jani.nikula at intel.com>

on both


>
> Cc: Jani Nikula <jani.nikula at intel.com>
> Reported-by: Nathan Chancellor <nathan at kernel.org>
> Tested-by: Nathan Chancellor <nathan at kernel.org>
> Fixes: e74c6aa955ca ("drm/i915/fbc: Register per-crtc debugfs files")
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  include/drm/drm_crtc.h | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
> index 13eeba2a750a..4d01b4d89775 100644
> --- a/include/drm/drm_crtc.h
> +++ b/include/drm/drm_crtc.h
> @@ -1135,14 +1135,12 @@ struct drm_crtc {
>  	 */
>  	spinlock_t commit_lock;
>  
> -#ifdef CONFIG_DEBUG_FS
>  	/**
>  	 * @debugfs_entry:
>  	 *
>  	 * Debugfs directory for this CRTC.
>  	 */
>  	struct dentry *debugfs_entry;
> -#endif
>  
>  	/**
>  	 * @crc:

-- 
Jani Nikula, Intel Open Source Graphics Center


More information about the dri-devel mailing list