[PATCH 1/3] drm: Fix compilation error when CONFIG_DEBUG_FS is undefined

Sean Paul seanpaul at chromium.org
Mon Mar 6 23:43:45 UTC 2017


On Mon, Mar 06, 2017 at 03:27:13PM -0500, Sean Paul wrote:
> This patch fixes the following compilation error when CONFIG_DEBUG_FS is not defined.
> 
> ../drivers/gpu/drm/drm_dp_helper.c: In function ‘drm_dp_aux_crc_work’:
> ../drivers/gpu/drm/drm_dp_helper.c:1029:13: error: ‘struct drm_crtc’ has no member named ‘crc’
> ../drivers/gpu/drm/drm_dp_helper.c:1031:12: error: ‘struct drm_crtc’ has no member named ‘crc’
>   make[4]: *** [drivers/gpu/drm/drm_dp_helper.o] Error 1
>   make[4]: *** Waiting for unfinished jobs....
> 
> Fixes: 79c1da7c3bf7 ("drm/dp: add helpers for capture of frame CRCs")
> Cc: Tomeu Vizoso <tomeu.vizoso at collabora.com>
> Cc: Sean Paul <seanpaul at chromium.org>
> Cc: Daniel Vetter <daniel.vetter at intel.com>
> Cc: Jani Nikula <jani.nikula at linux.intel.com>
> Cc: David Airlie <airlied at linux.ie>
> Cc: dri-devel at lists.freedesktop.org
> Signed-off-by: Sean Paul <seanpaul at chromium.org>

Applied to drm-misc-next with Emil's R-b

Sean

> ---
>  include/drm/drm_crtc.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
> index bda9347554a1..cba29ffedafd 100644
> --- a/include/drm/drm_crtc.h
> +++ b/include/drm/drm_crtc.h
> @@ -776,6 +776,7 @@ struct drm_crtc {
>  	 * Debugfs directory for this CRTC.
>  	 */
>  	struct dentry *debugfs_entry;
> +#endif
>  
>  	/**
>  	 * @crc:
> @@ -783,7 +784,6 @@ struct drm_crtc {
>  	 * Configuration settings of CRC capture.
>  	 */
>  	struct drm_crtc_crc crc;
> -#endif
>  
>  	/**
>  	 * @fence_context:
> -- 
> 2.12.0.rc1.440.g5b76565f74-goog


More information about the dri-devel mailing list