diff options
Diffstat (limited to 'meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0236-drm-amd-display-Surface-Validation-Fixes-Audio-Mask.patch')
-rw-r--r-- | meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0236-drm-amd-display-Surface-Validation-Fixes-Audio-Mask.patch | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0236-drm-amd-display-Surface-Validation-Fixes-Audio-Mask.patch b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0236-drm-amd-display-Surface-Validation-Fixes-Audio-Mask.patch new file mode 100644 index 00000000..a3e50215 --- /dev/null +++ b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0236-drm-amd-display-Surface-Validation-Fixes-Audio-Mask.patch @@ -0,0 +1,86 @@ +From 03c9b6d40a2f8980271de3db40fee34d78e65197 Mon Sep 17 00:00:00 2001 +From: Leon Elazar <leon.elazar@amd.com> +Date: Thu, 23 Feb 2017 16:10:43 -0500 +Subject: [PATCH 0236/4131] drm/amd/display: Surface Validation Fixes + Audio + Mask + +1. dc: Adding missing mask for audio register DCCG_AUDIO_DTO_SOURCE +2. Changing the surface validation to check the limits of the clip rect instead of the source rect. + +Signed-off-by: Leon Elazar <leon.elazar@amd.com> +Acked-by: Harry Wentland <Harry.Wentland@amd.com> +Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 1 + + drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 8 ++++---- + drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 4 ++-- + drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c | 4 ++-- + 4 files changed, 9 insertions(+), 8 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_audio.h b/drivers/gpu/drm/amd/display/dc/dce/dce_audio.h +index b98ee2d..0dc5ff1 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce/dce_audio.h ++++ b/drivers/gpu/drm/amd/display/dc/dce/dce_audio.h +@@ -48,6 +48,7 @@ + #define AUD_COMMON_MASK_SH_LIST_BASE(mask_sh)\ + SF(DCCG_AUDIO_DTO_SOURCE, DCCG_AUDIO_DTO0_SOURCE_SEL, mask_sh),\ + SF(DCCG_AUDIO_DTO_SOURCE, DCCG_AUDIO_DTO_SEL, mask_sh),\ ++ SF(DCCG_AUDIO_DTO_SOURCE, DCCG_AUDIO_DTO2_USE_512FBR_DTO, mask_sh),\ + SF(DCCG_AUDIO_DTO0_MODULE, DCCG_AUDIO_DTO0_MODULE, mask_sh),\ + SF(DCCG_AUDIO_DTO0_PHASE, DCCG_AUDIO_DTO0_PHASE, mask_sh),\ + SF(DCCG_AUDIO_DTO1_MODULE, DCCG_AUDIO_DTO1_MODULE, mask_sh),\ +diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +index cd3942d..80b2359 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +@@ -1009,10 +1009,10 @@ static bool dce110_validate_surface_sets( + if (set[i].surface_count > 2) + return false; + +- if (set[i].surfaces[0]->src_rect.width +- < set[i].stream->src.width +- || set[i].surfaces[0]->src_rect.height +- < set[i].stream->src.height) ++ if (set[i].surfaces[0]->clip_rect.width ++ > set[i].stream->src.width ++ || set[i].surfaces[0]->clip_rect.height ++ > set[i].stream->src.height) + return false; + if (set[i].surfaces[0]->format + >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN) +diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +index 526c106..ce6c69f 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +@@ -975,9 +975,9 @@ static bool dce112_validate_surface_sets( + return false; + + if (set[i].surfaces[0]->clip_rect.width +- < set[i].stream->src.width ++ > set[i].stream->src.width + || set[i].surfaces[0]->clip_rect.height +- < set[i].stream->src.height) ++ > set[i].stream->src.height) + return false; + if (set[i].surfaces[0]->format + >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN) +diff --git a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +index 272c7fc3..fbbdd0e 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +@@ -805,9 +805,9 @@ static bool dce80_validate_surface_sets( + return false; + + if (set[i].surfaces[0]->clip_rect.width +- != set[i].stream->src.width ++ > set[i].stream->src.width + || set[i].surfaces[0]->clip_rect.height +- != set[i].stream->src.height) ++ > set[i].stream->src.height) + return false; + if (set[i].surfaces[0]->format + >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN) +-- +2.7.4 + |