UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amd/display: add missing opp programming for odm 

A number of places opp programming was missing for odm second pipe.
This change fixes the oversight.

Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Dmytro Laktyushkin 2019-03-08 17:09:46 -05:00 committed by Alex Deucher
parent f25f06b67b
commit 661a8cd951
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/amd/display/dc/core/dc_link.c
View File

@ -2558,7 +2558,7 @@ void core_link_enable_stream(
struct dc_state *state, struct dc_state *state,
struct pipe_ctx *pipe_ctx) struct pipe_ctx *pipe_ctx)
{ {
struct dc *core_dc = pipe_ctx->stream->ctx->dc; struct dc *core_dc = pipe_ctx->stream->ctx->dc;
struct dc_stream_state *stream = pipe_ctx->stream; struct dc_stream_state *stream = pipe_ctx->stream;
enum dc_status status; enum dc_status status;
DC_LOGGER_INIT(pipe_ctx->stream->ctx->logger); DC_LOGGER_INIT(pipe_ctx->stream->ctx->logger);

10
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
View File

@ -2710,6 +2710,7 @@ static void set_crtc_test_pattern(struct dc_link *link,
enum dc_color_depth color_depth = pipe_ctx-> enum dc_color_depth color_depth = pipe_ctx->
stream->timing.display_color_depth; stream->timing.display_color_depth;
struct bit_depth_reduction_params params; struct bit_depth_reduction_params params;
struct output_pixel_processor *opp = pipe_ctx->stream_res.opp;
memset(&params, 0, sizeof(params)); memset(&params, 0, sizeof(params));
@ -2749,8 +2750,7 @@ static void set_crtc_test_pattern(struct dc_link *link,
{ {
/* disable bit depth reduction */ /* disable bit depth reduction */
pipe_ctx->stream->bit_depth_params = params; pipe_ctx->stream->bit_depth_params = params;
pipe_ctx->stream_res.opp->funcs-> opp->funcs->opp_program_bit_depth_reduction(opp, &params);
opp_program_bit_depth_reduction(pipe_ctx->stream_res.opp, &params);
if (pipe_ctx->stream_res.tg->funcs->set_test_pattern) if (pipe_ctx->stream_res.tg->funcs->set_test_pattern)
pipe_ctx->stream_res.tg->funcs->set_test_pattern(pipe_ctx->stream_res.tg, pipe_ctx->stream_res.tg->funcs->set_test_pattern(pipe_ctx->stream_res.tg,
controller_test_pattern, color_depth); controller_test_pattern, color_depth);
@ -2759,11 +2759,9 @@ static void set_crtc_test_pattern(struct dc_link *link,
case DP_TEST_PATTERN_VIDEO_MODE: case DP_TEST_PATTERN_VIDEO_MODE:
{ {
/* restore bitdepth reduction */ /* restore bitdepth reduction */
resource_build_bit_depth_reduction_params(pipe_ctx->stream, resource_build_bit_depth_reduction_params(pipe_ctx->stream, &params);
&params);
pipe_ctx->stream->bit_depth_params = params; pipe_ctx->stream->bit_depth_params = params;
pipe_ctx->stream_res.opp->funcs-> opp->funcs->opp_program_bit_depth_reduction(opp, &params);
opp_program_bit_depth_reduction(pipe_ctx->stream_res.opp, &params);
if (pipe_ctx->stream_res.tg->funcs->set_test_pattern) if (pipe_ctx->stream_res.tg->funcs->set_test_pattern)
pipe_ctx->stream_res.tg->funcs->set_test_pattern(pipe_ctx->stream_res.tg, pipe_ctx->stream_res.tg->funcs->set_test_pattern(pipe_ctx->stream_res.tg,
CONTROLLER_DP_TEST_PATTERN_VIDEOMODE, CONTROLLER_DP_TEST_PATTERN_VIDEOMODE,

2
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
View File

@ -1377,7 +1377,7 @@ static enum dc_status apply_single_controller_ctx_to_hw(
pipe_ctx->stream_res.opp, pipe_ctx->stream_res.opp,
COLOR_SPACE_YCBCR601, COLOR_SPACE_YCBCR601,
stream->timing.display_color_depth, stream->timing.display_color_depth,
pipe_ctx->stream->signal); stream->signal);
pipe_ctx->stream_res.opp->funcs->opp_program_fmt( pipe_ctx->stream_res.opp->funcs->opp_program_fmt(
pipe_ctx->stream_res.opp, pipe_ctx->stream_res.opp,