diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3120-drm-amd-display-Fix-null-derefs-on-non-dcn-builds.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3120-drm-amd-display-Fix-null-derefs-on-non-dcn-builds.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3120-drm-amd-display-Fix-null-derefs-on-non-dcn-builds.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3120-drm-amd-display-Fix-null-derefs-on-non-dcn-builds.patch new file mode 100644 index 00000000..edfc6b00 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3120-drm-amd-display-Fix-null-derefs-on-non-dcn-builds.patch @@ -0,0 +1,47 @@ +From 6b26acff5a5bec09dc3f0a61d9b24625351ebeb2 Mon Sep 17 00:00:00 2001 +From: Roman Li <Roman.Li@amd.com> +Date: Fri, 29 Dec 2017 17:45:03 -0500 +Subject: [PATCH 3120/4131] drm/amd/display: Fix null-derefs on non-dcn builds + +Fixing regression introduced by +'Use real BE and FE index to program regs.' + +Signed-off-by: Roman Li <Roman.Li@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 | 3 ++- + drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 3 ++- + 2 files changed, 4 insertions(+), 2 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 b0ffa7a..26c34e7 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +@@ -1407,7 +1407,8 @@ static int acquire_first_free_pipe( + pipe_ctx->plane_res.xfm = pool->transforms[i]; + pipe_ctx->plane_res.dpp = pool->dpps[i]; + pipe_ctx->stream_res.opp = pool->opps[i]; +- pipe_ctx->plane_res.mpcc_inst = pool->dpps[i]->inst; ++ if (pool->dpps[i]) ++ pipe_ctx->plane_res.mpcc_inst = pool->dpps[i]->inst; + pipe_ctx->pipe_idx = i; + + +diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +index 58823ba..d036d1d 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c ++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +@@ -2819,7 +2819,8 @@ static void dce110_apply_ctx_for_surface( + + static void dce110_power_down_fe(struct dc *dc, struct pipe_ctx *pipe_ctx) + { +- int fe_idx = pipe_ctx->plane_res.mi->inst; ++ int fe_idx = pipe_ctx->plane_res.mi ? ++ pipe_ctx->plane_res.mi->inst : pipe_ctx->pipe_idx; + + /* Do not power down fe when stream is active on dce*/ + if (dc->current_state->res_ctx.pipe_ctx[fe_idx].stream) +-- +2.7.4 + |