Commit f7655d42 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/edid: Add CTA-861-G modes with VIC >= 193 



Add a second table to the cea modes with VIC >= 193.

v2: Improve the comment for cea_modes_*[] to indicate
    that one should always use cea_mode_for_vic() (Tom)

Cc: Hans Verkuil <hansverk@cisco.com>
Reviewed-by: default avatarManasi Navare <manasi.d.navare@intel.com>
Reviewed-by: default avatarThomas Anderson <thomasanderson@google.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191213174348.27261-3-ville.syrjala@linux.intel.com
parent 7befe621

drivers/gpu/drm/drm_edid.c

+149 −2
Original line number Diff line number Diff line
@@ -1379,6 +1379,149 @@ static const struct drm_display_mode edid_cea_modes_0[] = { 
	  .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

};



/*

 * From CEA/CTA-861 spec.

 *

 * Do not access directly, instead always use cea_mode_for_vic().

 */

static const struct drm_display_mode edid_cea_modes_193[] = {

	/* 193 - 5120x2160@120Hz 64:27 */

	{ DRM_MODE("5120x2160", DRM_MODE_TYPE_DRIVER, 1485000, 5120, 5284,

		   5372, 5500, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 194 - 7680x4320@24Hz 16:9 */

	{ DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 1188000, 7680, 10232,

		   10408, 11000, 0, 4320, 4336, 4356, 4500, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 195 - 7680x4320@25Hz 16:9 */

	{ DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 1188000, 7680, 10032,

		   10208, 10800, 0, 4320, 4336, 4356, 4400, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 196 - 7680x4320@30Hz 16:9 */

	{ DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 1188000, 7680, 8232,

		   8408, 9000, 0, 4320, 4336, 4356, 4400, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 197 - 7680x4320@48Hz 16:9 */

	{ DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 2376000, 7680, 10232,

		   10408, 11000, 0, 4320, 4336, 4356, 4500, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 48, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 198 - 7680x4320@50Hz 16:9 */

	{ DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 2376000, 7680, 10032,

		   10208, 10800, 0, 4320, 4336, 4356, 4400, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 199 - 7680x4320@60Hz 16:9 */

	{ DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 2376000, 7680, 8232,

		   8408, 9000, 0, 4320, 4336, 4356, 4400, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 200 - 7680x4320@100Hz 16:9 */

	{ DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 4752000, 7680, 9792,

		   9968, 10560, 0, 4320, 4336, 4356, 4500, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 201 - 7680x4320@120Hz 16:9 */

	{ DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 4752000, 7680, 8032,

		   8208, 8800, 0, 4320, 4336, 4356, 4500, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 202 - 7680x4320@24Hz 64:27 */

	{ DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 1188000, 7680, 10232,

		   10408, 11000, 0, 4320, 4336, 4356, 4500, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 203 - 7680x4320@25Hz 64:27 */

	{ DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 1188000, 7680, 10032,

		   10208, 10800, 0, 4320, 4336, 4356, 4400, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 204 - 7680x4320@30Hz 64:27 */

	{ DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 1188000, 7680, 8232,

		   8408, 9000, 0, 4320, 4336, 4356, 4400, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 205 - 7680x4320@48Hz 64:27 */

	{ DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 2376000, 7680, 10232,

		   10408, 11000, 0, 4320, 4336, 4356, 4500, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 48, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 206 - 7680x4320@50Hz 64:27 */

	{ DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 2376000, 7680, 10032,

		   10208, 10800, 0, 4320, 4336, 4356, 4400, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 207 - 7680x4320@60Hz 64:27 */

	{ DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 2376000, 7680, 8232,

		   8408, 9000, 0, 4320, 4336, 4356, 4400, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 208 - 7680x4320@100Hz 64:27 */

	{ DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 4752000, 7680, 9792,

		   9968, 10560, 0, 4320, 4336, 4356, 4500, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 209 - 7680x4320@120Hz 64:27 */

	{ DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 4752000, 7680, 8032,

		   8208, 8800, 0, 4320, 4336, 4356, 4500, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 210 - 10240x4320@24Hz 64:27 */

	{ DRM_MODE("10240x4320", DRM_MODE_TYPE_DRIVER, 1485000, 10240, 11732,

		   11908, 12500, 0, 4320, 4336, 4356, 4950, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 211 - 10240x4320@25Hz 64:27 */

	{ DRM_MODE("10240x4320", DRM_MODE_TYPE_DRIVER, 1485000, 10240, 12732,

		   12908, 13500, 0, 4320, 4336, 4356, 4400, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 212 - 10240x4320@30Hz 64:27 */

	{ DRM_MODE("10240x4320", DRM_MODE_TYPE_DRIVER, 1485000, 10240, 10528,

		   10704, 11000, 0, 4320, 4336, 4356, 4500, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 213 - 10240x4320@48Hz 64:27 */

	{ DRM_MODE("10240x4320", DRM_MODE_TYPE_DRIVER, 2970000, 10240, 11732,

		   11908, 12500, 0, 4320, 4336, 4356, 4950, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 48, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 214 - 10240x4320@50Hz 64:27 */

	{ DRM_MODE("10240x4320", DRM_MODE_TYPE_DRIVER, 2970000, 10240, 12732,

		   12908, 13500, 0, 4320, 4336, 4356, 4400, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 215 - 10240x4320@60Hz 64:27 */

	{ DRM_MODE("10240x4320", DRM_MODE_TYPE_DRIVER, 2970000, 10240, 10528,

		   10704, 11000, 0, 4320, 4336, 4356, 4500, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 216 - 10240x4320@100Hz 64:27 */

	{ DRM_MODE("10240x4320", DRM_MODE_TYPE_DRIVER, 5940000, 10240, 12432,

		   12608, 13200, 0, 4320, 4336, 4356, 4500, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 217 - 10240x4320@120Hz 64:27 */

	{ DRM_MODE("10240x4320", DRM_MODE_TYPE_DRIVER, 5940000, 10240, 10528,

		   10704, 11000, 0, 4320, 4336, 4356, 4500, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 218 - 4096x2160@100Hz 256:135 */

	{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 1188000, 4096, 4896,

		   4984, 5280, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },

	/* 219 - 4096x2160@120Hz 256:135 */

	{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 1188000, 4096, 4184,

		   4272, 4400, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },

};



/*

 * HDMI 1.4 4k modes. Index using the VIC.

 */
@@ -3076,17 +3219,21 @@ static const struct drm_display_mode *cea_mode_for_vic(u8 vic) 
		return NULL;

	if (vic < ARRAY_SIZE(edid_cea_modes_0))

		return &edid_cea_modes_0[vic];

	if (vic >= 193 && vic < 193 + ARRAY_SIZE(edid_cea_modes_193))

		return &edid_cea_modes_193[vic - 193];

	return NULL;

}



static u8 cea_num_vics(void)

{

	return ARRAY_SIZE(edid_cea_modes_0);

	return 193 + ARRAY_SIZE(edid_cea_modes_193);

}



static u8 cea_next_vic(u8 vic)

{

	return vic + 1;

	if (++vic == ARRAY_SIZE(edid_cea_modes_0))

		vic = 193;

	return vic;

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE