From: Leon Elazar <leon.elazar@amd.com>
Date: Thu, 23 Feb 2017 16:10:43 -0500
Subject: drm/amd/display: Surface Validation Fixes + Audio Mask
Git-commit: 1781958ff41b28b3cd7b4a2ed691c932031c5515
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166
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>
Acked-by: Petr Tesarik <ptesarik@suse.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(-)
--- 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),\
--- 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)
--- 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)
--- 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)