[PATCH] drm/amd/display: Enable ogam_ram for dcn32+dcn35+dcn351

[Melissa Wen]

On 04/10, Joshua Ashton wrote:
> The comment here states "no OGAM in DPP since DCN1", yet that is not
> true.
> 
> Testing on an RX 7900XTX (dcn32), it actually does exist in hardware and
> works fine.
> My best guess is the comment is confused with OGAM ROM for DPP, rather
> than OGAM RAM.
> 
> I did not test dcn35/351 as I do not have that hardware, but I assume
> the same follows there given the seemingly erroneous comment.
> Someone at AMD should check that before merging this commit.

hmm... I don't have any of these hw versions, but AFAIU if there is
ogam/blend lut block in dcn32, the helper implementation for programming
it properly (i.e. dpp_program_blnd_lut) is also missing here:
- https://gitlab.freedesktop.org/agd5f/linux/-/blob/amd-staging-drm-next/drivers/gpu/drm/amd/display/dc/dpp/dcn32/dcn32_dpp.c#L125
right? So, it's good if AMD people can check it too.

Melissa

> 
> Signed-off-by: Joshua Ashton <joshua at froggi.es>
> 
> Cc: Harry Wentland <harry.wentland at amd.com>
> Cc: Xaver Hugl <xaver.hugl at gmail.com>
> Cc: Melissa Wen <mwen at igalia.com>
> Cc: Ethan Lee <flibitijibibo at gmail.com>
> ---
>  drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c  | 2 +-
>  drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c  | 2 +-
>  .../gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c    | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
> index 9aa39bd25be9..94f5d2b5aadf 100644
> --- a/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
> @@ -2182,7 +2182,7 @@ static bool dcn32_resource_construct(
>  	dc->caps.color.dpp.dgam_rom_for_yuv = 0;
>  
>  	dc->caps.color.dpp.hw_3d_lut = 1;
> -	dc->caps.color.dpp.ogam_ram = 0;  // no OGAM in DPP since DCN1
> +	dc->caps.color.dpp.ogam_ram = 1;
>  	// no OGAM ROM on DCN2 and later ASICs
>  	dc->caps.color.dpp.ogam_rom_caps.srgb = 0;
>  	dc->caps.color.dpp.ogam_rom_caps.bt2020 = 0;
> diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c
> index 25ac450944e7..708d63cc3f7f 100644
> --- a/drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c
> @@ -1861,7 +1861,7 @@ static bool dcn35_resource_construct(
>  	dc->caps.color.dpp.dgam_rom_for_yuv = 0;
>  
>  	dc->caps.color.dpp.hw_3d_lut = 1;
> -	dc->caps.color.dpp.ogam_ram = 0;  // no OGAM in DPP since DCN1
> +	dc->caps.color.dpp.ogam_ram = 1;
>  	// no OGAM ROM on DCN301
>  	dc->caps.color.dpp.ogam_rom_caps.srgb = 0;
>  	dc->caps.color.dpp.ogam_rom_caps.bt2020 = 0;
> diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c
> index 8a57adb27264..053e8ec6d1ef 100644
> --- a/drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c
> @@ -1841,7 +1841,7 @@ static bool dcn351_resource_construct(
>  	dc->caps.color.dpp.dgam_rom_for_yuv = 0;
>  
>  	dc->caps.color.dpp.hw_3d_lut = 1;
> -	dc->caps.color.dpp.ogam_ram = 0;  // no OGAM in DPP since DCN1
> +	dc->caps.color.dpp.ogam_ram = 1;
>  	// no OGAM ROM on DCN301
>  	dc->caps.color.dpp.ogam_rom_caps.srgb = 0;
>  	dc->caps.color.dpp.ogam_rom_caps.bt2020 = 0;
> -- 
> 2.44.0
>