From cc40fac9225368c25a0882d42beaffe8545433da Mon Sep 17 00:00:00 2001 From: Nicholas Kazlauskas Date: Mon, 4 Feb 2019 09:32:07 -0500 Subject: [PATCH 1192/2940] drm/amd/display: Don't re-enable CRC when CONFIG_DEBUG_FS isn't defined [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 Cc: Harry Wentland Fixes: 43a6a02eb355 ("drm/amd/display: Re-enable CRC capture following modeset") Signed-off-by: Nicholas Kazlauskas Reviewed-by: Harry Wentland --- 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 7bb43799cee9..e5b542e462c4 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5306,9 +5306,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*/ -- 2.17.1