[PATCH] drm/amdgpu/display: guard ttu_regs with CONFIG_DRM_AMD_DC_DCN

Harry Wentland harry.wentland at amd.com
Thu Apr 1 19:18:50 UTC 2021


On 2021-03-30 10:28 p.m., Alex Deucher wrote:
> Missing check for CONFIG_DRM_AMD_DC_DCN.
> 
> Fixes: 752106f5c5cd ("drm/amd/display: Set max TTU on DPG enable")
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> Cc: Wesley Chalmers <Wesley.Chalmers at amd.com>
> Cc: Stephen Rothwell <sfr at canb.auug.org.au>

Reviewed-by: Harry Wentland <harry.wentland at amd.com>

Harry

> ---
>   drivers/gpu/drm/amd/display/dc/core/dc.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
> index d9ab134a178f..a270879cbaba 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
> @@ -2599,6 +2599,7 @@ static void commit_planes_for_stream(struct dc *dc,
>   		}
>   	}
>   
> +#ifdef CONFIG_DRM_AMD_DC_DCN
>   	if (stream->test_pattern.type != DP_TEST_PATTERN_VIDEO_MODE) {
>   		struct pipe_ctx *mpcc_pipe;
>   		struct pipe_ctx *odm_pipe;
> @@ -2607,7 +2608,7 @@ static void commit_planes_for_stream(struct dc *dc,
>   			for (odm_pipe = mpcc_pipe; odm_pipe; odm_pipe = odm_pipe->next_odm_pipe)
>   				odm_pipe->ttu_regs.min_ttu_vblank = MAX_TTU;
>   	}
> -
> +#endif
>   
>   	if ((update_type != UPDATE_TYPE_FAST) && stream->update_flags.bits.dsc_changed)
>   		if (top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_enable) {
> 



More information about the amd-gfx mailing list