diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c
index 9f462a299ff3d2cd4dfa166f7bba03fa0e73b9c3..6cd1e93b50844ee7504cd6beb595ab358cb7a913 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c
@@ -66,11 +66,6 @@ void color_space_to_black_color(
 	}
 
 	switch (colorspace) {
-	case COLOR_SPACE_YPBPR601:
-		*black_color = black_color_format[BLACK_COLOR_FORMAT_YUV_TV];
-		break;
-
-	case COLOR_SPACE_YPBPR709:
 	case COLOR_SPACE_YCBCR601:
 	case COLOR_SPACE_YCBCR709:
 	case COLOR_SPACE_YCBCR601_LIMITED:
diff --git a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
index 53c73de75da9fc2117b13857d42f15191f09c95a..21092f33c83b551883bc71b264bf1ec82e33bddc 100644
--- a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
@@ -435,8 +435,6 @@ enum dc_color_space {
 	COLOR_SPACE_UNKNOWN,
 	COLOR_SPACE_SRGB,
 	COLOR_SPACE_SRGB_LIMITED,
-	COLOR_SPACE_YPBPR601,
-	COLOR_SPACE_YPBPR709,
 	COLOR_SPACE_YCBCR601,
 	COLOR_SPACE_YCBCR709,
 	COLOR_SPACE_YCBCR601_LIMITED,
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_opp.c b/drivers/gpu/drm/amd/display/dc/dce/dce_opp.c
index 62f01911639fae7653bea388bb6732ae69eeeb06..9247afd4d42faab4518033ddb87516f290557df6 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_opp.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_opp.c
@@ -827,14 +827,12 @@ static bool configure_graphics_mode(
 					OUTPUT_CSC_GRPH_MODE, 1);
 				break;
 			case COLOR_SPACE_YCBCR601:
-			case COLOR_SPACE_YPBPR601:
 			case COLOR_SPACE_YCBCR601_LIMITED:
 				/* YCbCr601 */
 				REG_SET(OUTPUT_CSC_CONTROL, 0,
 					OUTPUT_CSC_GRPH_MODE, 2);
 				break;
 			case COLOR_SPACE_YCBCR709:
-			case COLOR_SPACE_YPBPR709:
 			case COLOR_SPACE_YCBCR709_LIMITED:
 				/* YCbCr709 */
 				REG_SET(OUTPUT_CSC_CONTROL, 0,
@@ -858,14 +856,12 @@ static bool configure_graphics_mode(
 				OUTPUT_CSC_GRPH_MODE, 1);
 			break;
 		case COLOR_SPACE_YCBCR601:
-		case COLOR_SPACE_YPBPR601:
 		case COLOR_SPACE_YCBCR601_LIMITED:
 			/* YCbCr601 */
 			REG_SET(OUTPUT_CSC_CONTROL, 0,
 				OUTPUT_CSC_GRPH_MODE, 2);
 			break;
 		case COLOR_SPACE_YCBCR709:
-		case COLOR_SPACE_YPBPR709:
 		case COLOR_SPACE_YCBCR709_LIMITED:
 			 /* YCbCr709 */
 			REG_SET(OUTPUT_CSC_CONTROL, 0,
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_csc_v.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_csc_v.c
index 6995a3de7564d5d2961276108bd4a3440cd1785e..019effe4c99c1a73b3a734f829ca18a78425f753 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_csc_v.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_csc_v.c
@@ -383,8 +383,6 @@ static bool configure_graphics_mode_v(
 			/* not supported for underlay on CZ */
 			return false;
 
-		case COLOR_SPACE_YCBCR601:
-		case COLOR_SPACE_YPBPR601:
 		case COLOR_SPACE_YCBCR601_LIMITED:
 			/* YCbCr601 */
 			set_reg_field_value(
@@ -394,7 +392,6 @@ static bool configure_graphics_mode_v(
 				OUTPUT_CSC_MODE);
 			break;
 		case COLOR_SPACE_YCBCR709:
-		case COLOR_SPACE_YPBPR709:
 		case COLOR_SPACE_YCBCR709_LIMITED:
 			/* YCbCr709 */
 			set_reg_field_value(
@@ -421,7 +418,6 @@ static bool configure_graphics_mode_v(
 			/* not supported for underlay on CZ */
 			return false;
 		case COLOR_SPACE_YCBCR601:
-		case COLOR_SPACE_YPBPR601:
 		case COLOR_SPACE_YCBCR601_LIMITED:
 			/* YCbCr601 */
 			set_reg_field_value(
@@ -431,7 +427,6 @@ static bool configure_graphics_mode_v(
 				OUTPUT_CSC_MODE);
 			break;
 		case COLOR_SPACE_YCBCR709:
-		case COLOR_SPACE_YPBPR709:
 		case COLOR_SPACE_YCBCR709_LIMITED:
 			 /* YCbCr709 */
 			set_reg_field_value(