drm/amd/display: Avoid conflict between HDR multiplier and 3dlut

Browse source

[WHY]
There can be a conflict between OS HDR multiplier and 3dlut HDR
multiplier, which are both sent to DC.

[HOW]
Instead of having dc determine which HDR multiplier to use, make the
decision in dm and send only the intended value in a surface update.
Store the current OS HDR multiplier and determine whether to use it or
the 3dlut's multiplier before sending the surface update to dc. Send
multiplier to dc in fixed31_32 format, dc then converts it to hw format.

Signed-off-by: Michael Strauss <michael.strauss@amd.com>
Reviewed-by: Krunoslav Kovac <Krunoslav.Kovac@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

...

This commit is contained in:

Michael Strauss 2019-11-03 09:35:03 -05:00 • committed by Alex Deucher

parent 9185e8adb4

commit 46250a0cba

4 changed files with 22 additions and 24 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

17

drivers/gpu/drm/amd/display/dc/core/dc.c

View file

9

drivers/gpu/drm/amd/display/dc/dc.h

View file

10

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

View file

10

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c

View file