[PATCH] drm/amd/display: Don't re-enable CRC when CONFIG_DEBUG_FS isn't defined

Wentland, Harry Harry.Wentland at amd.com
Mon Feb 4 20:59:54 UTC 2019


On 2019-02-04 9:32 a.m., Nicholas Kazlauskas wrote:
> [Why]
> When CONFIG_DEBUG_FS isn't defined then amdgpu_dm_crtc_set_crc_source
> is NULL. This causes a compilation error since it's being called
> unconditionally.
> 
> [How]
> Guard the call based on CONFIG_DEBUG_FS - CRC capture isn't supported
> without this.
> 
> Cc: Leo Li <sunpeng.li at amd.com>
> Cc: Harry Wentland <harry.wentland at amd.com>
> Fixes: 43a6a02eb355 ("drm/amd/display: Re-enable CRC capture following modeset")
> Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas at amd.com>

Reviewed-by: Harry Wentland <harry.wentland at amd.com>

Harry

> ---
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index a2453900e15a..cacb8fe5a1ad 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -5284,9 +5284,11 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
>  
>  		manage_dm_interrupts(adev, acrtc, true);
>  
> +#ifdef CONFIG_DEBUG_FS
>  		/* The stream has changed so CRC capture needs to re-enabled. */
>  		if (dm_new_crtc_state->crc_enabled)
>  			amdgpu_dm_crtc_set_crc_source(crtc, "auto");
> +#endif
>  	}
>  
>  	/* update planes when needed per crtc*/
> 


More information about the amd-gfx mailing list