drm/amd/display: Fix SPL related enum definition used in DCN401

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>

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 3c33c3bcbe2cb962c1dcef0fca42f6d453797c5e..97c78cadb60395023613d7f1ca4f3b9f1f6830b4 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -46,6 +46,8 @@
 
 #include "dmub/inc/dmub_cmd.h"
 
+#include "spl/dc_spl_types.h"
+
 struct abm_save_restore;
 
 /* forward declaration */

diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/transform.h b/drivers/gpu/drm/amd/display/dc/inc/hw/transform.h
index 9ac9d5e8df8b9117c5d1b7f122c68fa2d29fb743..a2c57676b08d02f67b8ad7275de18394667d683d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/transform.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/transform.h
@@ -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;
@@ -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;