diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2559-drm-amd-display-add-null-check-for-cursor-functions.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2559-drm-amd-display-add-null-check-for-cursor-functions.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2559-drm-amd-display-add-null-check-for-cursor-functions.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2559-drm-amd-display-add-null-check-for-cursor-functions.patch new file mode 100644 index 00000000..586fbab3 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2559-drm-amd-display-add-null-check-for-cursor-functions.patch @@ -0,0 +1,60 @@ +From c101bb93b74f080d3e9bd9ad789964d581b97fd9 Mon Sep 17 00:00:00 2001 +From: Yue Hin Lau <Yuehin.Lau@amd.com> +Date: Thu, 5 Oct 2017 17:57:35 -0400 +Subject: [PATCH 2559/4131] drm/amd/display: add null check for cursor + functions + +Signed-off-by: Yue Hin Lau <Yuehin.Lau@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_stream.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c +index 4116787..10421ea 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c +@@ -210,11 +210,13 @@ bool dc_stream_set_cursor_attributes( + pipe_ctx->plane_res.ipp->funcs->ipp_cursor_set_attributes( + pipe_ctx->plane_res.ipp, attributes); + +- if (pipe_ctx->plane_res.hubp != NULL) ++ if (pipe_ctx->plane_res.hubp != NULL && ++ pipe_ctx->plane_res.hubp->funcs->set_cursor_attributes != NULL) + pipe_ctx->plane_res.hubp->funcs->set_cursor_attributes( + pipe_ctx->plane_res.hubp, attributes); + +- if (pipe_ctx->plane_res.mi != NULL) ++ if (pipe_ctx->plane_res.mi != NULL && ++ pipe_ctx->plane_res.mi->funcs->set_cursor_attributes != NULL) + pipe_ctx->plane_res.mi->funcs->set_cursor_attributes( + pipe_ctx->plane_res.mi, attributes); + +@@ -253,6 +255,7 @@ bool dc_stream_set_cursor_position( + for (i = 0; i < MAX_PIPES; i++) { + struct pipe_ctx *pipe_ctx = &res_ctx->pipe_ctx[i]; + struct input_pixel_processor *ipp = pipe_ctx->plane_res.ipp; ++ struct mem_input *mi = pipe_ctx->plane_res.mi; + struct hubp *hubp = pipe_ctx->plane_res.hubp; + struct transform *xfm = pipe_ctx->plane_res.xfm; + struct dc_cursor_position pos_cpy = *position; +@@ -281,10 +284,13 @@ bool dc_stream_set_cursor_position( + if (ipp->funcs->ipp_cursor_set_position != NULL) + ipp->funcs->ipp_cursor_set_position(ipp, &pos_cpy, ¶m); + +- if (hubp != NULL) ++ if (mi != NULL && mi->funcs->set_cursor_position != NULL) ++ mi->funcs->set_cursor_position(mi, &pos_cpy, ¶m); ++ ++ if (hubp != NULL && hubp->funcs->set_cursor_position != NULL) + hubp->funcs->set_cursor_position(hubp, &pos_cpy, ¶m); + +- if (xfm != NULL) ++ if (xfm != NULL && xfm->funcs->set_cursor_position != NULL) + xfm->funcs->set_cursor_position(xfm, &pos_cpy, ¶m, hubp->curs_attr.width); + + } +-- +2.7.4 + |