diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3482-drm-amd-display-Check-return-code-for-CRC-drm_crtc_v.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3482-drm-amd-display-Check-return-code-for-CRC-drm_crtc_v.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3482-drm-amd-display-Check-return-code-for-CRC-drm_crtc_v.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3482-drm-amd-display-Check-return-code-for-CRC-drm_crtc_v.patch new file mode 100644 index 00000000..f95d11f6 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3482-drm-amd-display-Check-return-code-for-CRC-drm_crtc_v.patch @@ -0,0 +1,55 @@ +From 8d7a3ec3354df8a293c4c2ab1a6462afdef8e7b3 Mon Sep 17 00:00:00 2001 +From: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> +Date: Tue, 20 Aug 2019 12:58:37 -0400 +Subject: [PATCH 3482/4256] drm/amd/display: Check return code for CRC + drm_crtc_vblank_get + +[Why] +The call to drm_crtc_vblank_get can fail if vblank is disabled and +we try to increment the reference. + +Since drm_crtc_vblank_get internally drops the reference when it fails +it means the subsequent drm_crtc_vblank_put(...) when closing the file +drops a zero reference. + +This was found via igt@kms_plane@pixel-format-pipe-A-planes. + +[How] +Check the return code and return it on failure. + +We wouldn't have been able to enable CRC reading anyway since vblank +wasn't enabled. + +Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> +Reviewed-by: David Francis <David.Francis@amd.com> +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c +index e9a2c432e4d0..54c754524d68 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c +@@ -106,6 +106,7 @@ int amdgpu_dm_crtc_set_crc_source(struct drm_crtc *crtc, const char *src_name) + struct drm_dp_aux *aux = NULL; + bool enable = false; + bool enabled = false; ++ int ret; + + enum amdgpu_dm_pipe_crc_source source = dm_parse_crc_source(src_name); + +@@ -177,7 +178,10 @@ int amdgpu_dm_crtc_set_crc_source(struct drm_crtc *crtc, const char *src_name) + */ + enabled = amdgpu_dm_is_valid_crc_source(crtc_state->crc_src); + if (!enabled && enable) { +- drm_crtc_vblank_get(crtc); ++ ret = drm_crtc_vblank_get(crtc); ++ if (ret) ++ return ret; ++ + if (dm_is_crc_source_dprx(source)) { + if (drm_dp_start_crc(aux, crtc)) { + DRM_DEBUG_DRIVER("dp start crc failed\n"); +-- +2.17.1 + |