diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2607-drm-amd-display-Add-null-check-for-24BPP-xfm-and-dpp.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2607-drm-amd-display-Add-null-check-for-24BPP-xfm-and-dpp.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2607-drm-amd-display-Add-null-check-for-24BPP-xfm-and-dpp.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2607-drm-amd-display-Add-null-check-for-24BPP-xfm-and-dpp.patch new file mode 100644 index 00000000..a7e79c29 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2607-drm-amd-display-Add-null-check-for-24BPP-xfm-and-dpp.patch @@ -0,0 +1,58 @@ +From 0a6c16787cf139c6c40918289668a0c3c5bce0e0 Mon Sep 17 00:00:00 2001 +From: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> +Date: Fri, 13 Oct 2017 12:13:02 -0400 +Subject: [PATCH 2607/4131] drm/amd/display: Add null check for 24BPP (xfm and + dpp) + +Fixes Nullptr error when trying 24BPP + +Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> +Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> +Acked-by: Harry Wentland <Harry.Wentland@amd.com> +--- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +index d1cdf9f..a2f9be3 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +@@ -856,6 +856,7 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx) + pipe_ctx->plane_res.scl_data.h_active = timing->h_addressable + timing->h_border_left + timing->h_border_right; + pipe_ctx->plane_res.scl_data.v_active = timing->v_addressable + timing->v_border_top + timing->v_border_bottom; + ++ + /* Taps calculations */ + if (pipe_ctx->plane_res.xfm != NULL) + res = pipe_ctx->plane_res.xfm->funcs->transform_get_optimal_number_of_taps( +@@ -864,16 +865,21 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx) + if (pipe_ctx->plane_res.dpp != NULL) + res = pipe_ctx->plane_res.dpp->funcs->dpp_get_optimal_number_of_taps( + pipe_ctx->plane_res.dpp, &pipe_ctx->plane_res.scl_data, &plane_state->scaling_quality); +- + if (!res) { + /* Try 24 bpp linebuffer */ + pipe_ctx->plane_res.scl_data.lb_params.depth = LB_PIXEL_DEPTH_24BPP; + +- res = pipe_ctx->plane_res.xfm->funcs->transform_get_optimal_number_of_taps( +- pipe_ctx->plane_res.xfm, &pipe_ctx->plane_res.scl_data, &plane_state->scaling_quality); +- +- res = pipe_ctx->plane_res.dpp->funcs->dpp_get_optimal_number_of_taps( +- pipe_ctx->plane_res.dpp, &pipe_ctx->plane_res.scl_data, &plane_state->scaling_quality); ++ if (pipe_ctx->plane_res.xfm != NULL) ++ res = pipe_ctx->plane_res.xfm->funcs->transform_get_optimal_number_of_taps( ++ pipe_ctx->plane_res.xfm, ++ &pipe_ctx->plane_res.scl_data, ++ &plane_state->scaling_quality); ++ ++ if (pipe_ctx->plane_res.dpp != NULL) ++ res = pipe_ctx->plane_res.dpp->funcs->dpp_get_optimal_number_of_taps( ++ pipe_ctx->plane_res.dpp, ++ &pipe_ctx->plane_res.scl_data, ++ &plane_state->scaling_quality); + } + + if (res) +-- +2.7.4 + |