Commit 892b41b1 authored by Hersen Wu's avatar Hersen Wu Committed by Alex Deucher
Browse files

drm/amd/display: Fix incorrect DSC instance for MST 



[Why] DSC debugfs, such as dp_dsc_clock_en_read,
use aconnector->dc_link to find pipe_ctx for display.
Displays connected to MST hub share the same dc_link.
DSC instance is from pipe_ctx. This causes incorrect
DSC instance for display connected to MST hub.

[How] Add aconnector->sink check to find pipe_ctx.

CC: stable@vger.kernel.org
Reviewed-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarHersen Wu <hersenxs.wu@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9a35d205

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c

+36 −12
Original line number Diff line number Diff line
@@ -1495,7 +1495,9 @@ static ssize_t dp_dsc_clock_en_read(struct file *f, char __user *buf, 
	for (i = 0; i < MAX_PIPES; i++) {

		pipe_ctx = &aconnector->dc_link->dc->current_state->res_ctx.pipe_ctx[i];

		if (pipe_ctx->stream &&

		    pipe_ctx->stream->link == aconnector->dc_link)

		    pipe_ctx->stream->link == aconnector->dc_link &&

		    pipe_ctx->stream->sink &&

		    pipe_ctx->stream->sink == aconnector->dc_sink)

			break;

	}
@@ -1596,7 +1598,9 @@ static ssize_t dp_dsc_clock_en_write(struct file *f, const char __user *buf, 
	for (i = 0; i < MAX_PIPES; i++) {

		pipe_ctx = &aconnector->dc_link->dc->current_state->res_ctx.pipe_ctx[i];

		if (pipe_ctx->stream &&

		    pipe_ctx->stream->link == aconnector->dc_link)

		    pipe_ctx->stream->link == aconnector->dc_link &&

		    pipe_ctx->stream->sink &&

		    pipe_ctx->stream->sink == aconnector->dc_sink)

			break;

	}
@@ -1681,7 +1685,9 @@ static ssize_t dp_dsc_slice_width_read(struct file *f, char __user *buf, 
	for (i = 0; i < MAX_PIPES; i++) {

		pipe_ctx = &aconnector->dc_link->dc->current_state->res_ctx.pipe_ctx[i];

		if (pipe_ctx->stream &&

		    pipe_ctx->stream->link == aconnector->dc_link)

		    pipe_ctx->stream->link == aconnector->dc_link &&

		    pipe_ctx->stream->sink &&

		    pipe_ctx->stream->sink == aconnector->dc_sink)

			break;

	}
@@ -1780,7 +1786,9 @@ static ssize_t dp_dsc_slice_width_write(struct file *f, const char __user *buf, 
	for (i = 0; i < MAX_PIPES; i++) {

		pipe_ctx = &aconnector->dc_link->dc->current_state->res_ctx.pipe_ctx[i];

		if (pipe_ctx->stream &&

		    pipe_ctx->stream->link == aconnector->dc_link)

		    pipe_ctx->stream->link == aconnector->dc_link &&

		    pipe_ctx->stream->sink &&

		    pipe_ctx->stream->sink == aconnector->dc_sink)

			break;

	}
@@ -1865,7 +1873,9 @@ static ssize_t dp_dsc_slice_height_read(struct file *f, char __user *buf, 
	for (i = 0; i < MAX_PIPES; i++) {

		pipe_ctx = &aconnector->dc_link->dc->current_state->res_ctx.pipe_ctx[i];

		if (pipe_ctx->stream &&

		    pipe_ctx->stream->link == aconnector->dc_link)

		    pipe_ctx->stream->link == aconnector->dc_link &&

		    pipe_ctx->stream->sink &&

		    pipe_ctx->stream->sink == aconnector->dc_sink)

			break;

	}
@@ -1964,7 +1974,9 @@ static ssize_t dp_dsc_slice_height_write(struct file *f, const char __user *buf, 
	for (i = 0; i < MAX_PIPES; i++) {

		pipe_ctx = &aconnector->dc_link->dc->current_state->res_ctx.pipe_ctx[i];

		if (pipe_ctx->stream &&

		    pipe_ctx->stream->link == aconnector->dc_link)

		    pipe_ctx->stream->link == aconnector->dc_link &&

		    pipe_ctx->stream->sink &&

		    pipe_ctx->stream->sink == aconnector->dc_sink)

			break;

	}
@@ -2045,7 +2057,9 @@ static ssize_t dp_dsc_bits_per_pixel_read(struct file *f, char __user *buf, 
	for (i = 0; i < MAX_PIPES; i++) {

		pipe_ctx = &aconnector->dc_link->dc->current_state->res_ctx.pipe_ctx[i];

		if (pipe_ctx->stream &&

		    pipe_ctx->stream->link == aconnector->dc_link)

		    pipe_ctx->stream->link == aconnector->dc_link &&

		    pipe_ctx->stream->sink &&

		    pipe_ctx->stream->sink == aconnector->dc_sink)

			break;

	}
@@ -2141,7 +2155,9 @@ static ssize_t dp_dsc_bits_per_pixel_write(struct file *f, const char __user *bu 
	for (i = 0; i < MAX_PIPES; i++) {

		pipe_ctx = &aconnector->dc_link->dc->current_state->res_ctx.pipe_ctx[i];

		if (pipe_ctx->stream &&

		    pipe_ctx->stream->link == aconnector->dc_link)

		    pipe_ctx->stream->link == aconnector->dc_link &&

		    pipe_ctx->stream->sink &&

		    pipe_ctx->stream->sink == aconnector->dc_sink)

			break;

	}
@@ -2220,7 +2236,9 @@ static ssize_t dp_dsc_pic_width_read(struct file *f, char __user *buf, 
	for (i = 0; i < MAX_PIPES; i++) {

		pipe_ctx = &aconnector->dc_link->dc->current_state->res_ctx.pipe_ctx[i];

		if (pipe_ctx->stream &&

		    pipe_ctx->stream->link == aconnector->dc_link)

		    pipe_ctx->stream->link == aconnector->dc_link &&

		    pipe_ctx->stream->sink &&

		    pipe_ctx->stream->sink == aconnector->dc_sink)

			break;

	}
@@ -2276,7 +2294,9 @@ static ssize_t dp_dsc_pic_height_read(struct file *f, char __user *buf, 
	for (i = 0; i < MAX_PIPES; i++) {

		pipe_ctx = &aconnector->dc_link->dc->current_state->res_ctx.pipe_ctx[i];

		if (pipe_ctx->stream &&

		    pipe_ctx->stream->link == aconnector->dc_link)

		    pipe_ctx->stream->link == aconnector->dc_link &&

		    pipe_ctx->stream->sink &&

		    pipe_ctx->stream->sink == aconnector->dc_sink)

			break;

	}
@@ -2347,7 +2367,9 @@ static ssize_t dp_dsc_chunk_size_read(struct file *f, char __user *buf, 
	for (i = 0; i < MAX_PIPES; i++) {

		pipe_ctx = &aconnector->dc_link->dc->current_state->res_ctx.pipe_ctx[i];

		if (pipe_ctx->stream &&

		    pipe_ctx->stream->link == aconnector->dc_link)

		    pipe_ctx->stream->link == aconnector->dc_link &&

		    pipe_ctx->stream->sink &&

		    pipe_ctx->stream->sink == aconnector->dc_sink)

			break;

	}
@@ -2418,7 +2440,9 @@ static ssize_t dp_dsc_slice_bpg_offset_read(struct file *f, char __user *buf, 
	for (i = 0; i < MAX_PIPES; i++) {

		pipe_ctx = &aconnector->dc_link->dc->current_state->res_ctx.pipe_ctx[i];

		if (pipe_ctx->stream &&

		    pipe_ctx->stream->link == aconnector->dc_link)

		    pipe_ctx->stream->link == aconnector->dc_link &&

		    pipe_ctx->stream->sink &&

		    pipe_ctx->stream->sink == aconnector->dc_sink)

			break;

	}