Skip to content

Commit

Permalink
drm/amd/display: Fix SPL related enum definition used in DCN401
Browse files Browse the repository at this point in the history
Remove a duplicate definition of an SPL related enum transform.h
Since its used in SPL, it has been moved to its own header.

Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Acked-by: Rodrigo Siqueira <rodrigo.siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Aurabindo Pillai authored and Alex Deucher committed Apr 26, 2024
1 parent 70839da commit 5bdf199
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 16 deletions.
2 changes: 2 additions & 0 deletions drivers/gpu/drm/amd/display/dc/dc.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@

#include "dmub/inc/dmub_cmd.h"

#include "spl/dc_spl_types.h"

struct abm_save_restore;

/* forward declaration */
Expand Down
18 changes: 2 additions & 16 deletions drivers/gpu/drm/amd/display/dc/inc/hw/transform.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
#include "dc_hw_types.h"
#include "fixed31_32.h"

#include "spl/dc_spl_types.h"

#define CSC_TEMPERATURE_MATRIX_SIZE 12

struct bit_depth_reduction_params;
Expand Down Expand Up @@ -110,22 +112,6 @@ enum graphics_gamut_adjust_type {
GRAPHICS_GAMUT_ADJUST_TYPE_SW /* use adjustments */
};

enum lb_memory_config {
/* Enable all 3 pieces of memory */
LB_MEMORY_CONFIG_0 = 0,

/* Enable only the first piece of memory */
LB_MEMORY_CONFIG_1 = 1,

/* Enable only the second piece of memory */
LB_MEMORY_CONFIG_2 = 2,

/* Only applicable in 4:2:0 mode, enable all 3 pieces of memory and the
* last piece of chroma memory used for the luma storage
*/
LB_MEMORY_CONFIG_3 = 3
};

struct xfm_grph_csc_adjustment {
struct fixed31_32 temperature_matrix[CSC_TEMPERATURE_MATRIX_SIZE];
enum graphics_gamut_adjust_type gamut_adjust_type;
Expand Down

0 comments on commit 5bdf199

Please sign in to comment.