summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordan Lazare <Jordan.Lazare@amd.com>2017-11-13 17:57:33 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-11-28 17:55:17 -0500
commit1b61973f9e0e7724bdc779ef3f9b55bd21b08db4 (patch)
tree4a234287c7231e6c8d8c2e79a79b42d8792dc0c9
parent16fb754a294d25f4077e1f475d930c22698f442a (diff)
downloadlinux-stable-1b61973f9e0e7724bdc779ef3f9b55bd21b08db4.tar.gz
linux-stable-1b61973f9e0e7724bdc779ef3f9b55bd21b08db4.tar.bz2
linux-stable-1b61973f9e0e7724bdc779ef3f9b55bd21b08db4.zip
drm/amd/display: Revert noisy assert messages
This partially reverts commit 4fb48bb66211 ("dc: fix split viewport rounding error"). Signed-off-by: Jordan Lazare <Jordan.Lazare@amd.com> Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> Acked-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c b/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
index 983987f7c983..3dce35e66b09 100644
--- a/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
+++ b/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
@@ -890,10 +890,6 @@ bool dcn_validate_bandwidth(
+ pipe->bottom_pipe->plane_res.scl_data.recout.width;
}
- ASSERT(pipe->plane_res.scl_data.ratios.horz.value != dal_fixed31_32_one.value
- || v->scaler_rec_out_width[input_idx] == v->viewport_width[input_idx]);
- ASSERT(pipe->plane_res.scl_data.ratios.vert.value != dal_fixed31_32_one.value
- || v->scaler_recout_height[input_idx] == v->viewport_height[input_idx]);
v->dcc_enable[input_idx] = pipe->plane_state->dcc.enable ? dcn_bw_yes : dcn_bw_no;
v->source_pixel_format[input_idx] = tl_pixel_format_to_bw_defs(
pipe->plane_state->format);