2 files changed, 22 insertions, 0 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 913fafa597ad..d57dfb954257 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -1382,6 +1382,13 @@ static struct drm_prop_enum_list radeon_dither_enum_list[] =
         { RADEON_FMT_DITHER_ENABLE, "on" },
 };
 
+static struct drm_prop_enum_list radeon_output_csc_enum_list[] =
+{       { RADEON_OUTPUT_CSC_BYPASS, "bypass" },
+        { RADEON_OUTPUT_CSC_TVRGB, "tvrgb" },
+        { RADEON_OUTPUT_CSC_YCBCR601, "ycbcr601" },
+        { RADEON_OUTPUT_CSC_YCBCR709, "ycbcr709" },
+};
+
 static int radeon_modeset_create_props(struct radeon_device *rdev)
 {
         int sz;
@@ -1444,6 +1451,12 @@ static int radeon_modeset_create_props(struct radeon_device *rdev)
                                          "dither",
                                          radeon_dither_enum_list, sz);
 
+        sz = ARRAY_SIZE(radeon_output_csc_enum_list);
+        rdev->mode_info.output_csc_property =
+                drm_property_create_enum(rdev->ddev, 0,
+                                         "output_csc",
+                                         radeon_output_csc_enum_list, sz);
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
index 920a8be8abad..67d4f776147d 100644
--- a/drivers/gpu/drm/radeon/radeon_mode.h
+++ b/drivers/gpu/drm/radeon/radeon_mode.h
@@ -85,6 +85,13 @@ enum radeon_hpd_id {
         RADEON_HPD_NONE = 0xff,
 };
 
+enum radeon_output_csc {
+        RADEON_OUTPUT_CSC_BYPASS = 0,
+        RADEON_OUTPUT_CSC_TVRGB = 1,
+        RADEON_OUTPUT_CSC_YCBCR601 = 2,
+        RADEON_OUTPUT_CSC_YCBCR709 = 3,
+};
+
 #define RADEON_MAX_I2C_BUS 16
 
 /* radeon gpio-based i2c
@@ -255,6 +262,8 @@ struct radeon_mode_info {
         struct drm_property *audio_property;
         /* FMT dithering */
         struct drm_property *dither_property;
+        /* Output CSC */
+        struct drm_property *output_csc_property;
         /* hardcoded DFP edid from BIOS */
         struct edid *bios_hardcoded_edid;
         int bios_hardcoded_edid_size;