Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 820ae48e authored by Shashank Sharma's avatar Shashank Sharma Committed by Gerrit - the friendly Code Review server
Browse files

drm/edid: complete CEA modedb(VIC 1-107) 

CEA-861-F specs defines new video modes to be used with
HDMI 2.0 EDIDs. The VIC range has been extended from 1-64 to
1-107.

Our existing CEA modedb contains only 64 modes (VIC=1 to VIC=64). Now
to be able to parse new CEA modes using the existing methods, we have
to complete the modedb (VIC=65 onwards).

This patch adds:
- Timings for existing CEA video modes (from VIC=65 till VIC=92)
- Newly added 4k modes (from VIC=93 to VIC=107).

The patch was originaly discussed and reviewed here:
https://patchwork.freedesktop.org/patch/135810/



Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Jose Abreu <Jose.Abreu@synopsys.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Harry Wentland <harry.wentland@amd.com>

V2: Rebase
V3: Rebase
V4: Added native bit handling as per CEA-861-F spec (Ville)
V5: Fix timings for VIC 77:1920x1080 and 104:3840x2160p (Ville)
    Remove unnecessary paranthesis from function svd_to_vic (Ville)
    Added r-b (Neil)
V6: Rebase
V7: Fix indentation for modes from VIC 80

Reviewed-by: default avatarJose Abreu <Jose.Abreu@synopsys.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarShashank Sharma <shashank.sharma@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1499960000-9232-3-git-send-email-shashank.sharma@intel.com


[vsyrjala: Fix up remaining formatting/indentation issues]
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>

Change-Id: I66d8e721ecd18db64c09bac77749bcd12b7aa120
Git-commit: 8ec6e0755565192b328059b64f982adabbecda78
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


[nbahrani@codeaurora.org: resolve merge conflicts by removing
 dependency to the codes not available]
Signed-off-by: default avatarNavid Bahrani <nbahrani@codeaurora.org>
parent 55cc722e

drivers/gpu/drm/drm_edid.c

+91 −91
Original line number Diff line number Diff line
@@ -1067,7 +1067,7 @@ static const struct drm_display_mode edid_cea_modes[] = { 
	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 77 - 1920x1080@100Hz */

	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 297000, 1920, 2448,

		   2492, 2640, 0, 1080, 1084, 1094, 1125, 0,

		   2492, 2640, 0, 1080, 1084, 1089, 1125, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

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

	/* 78 - 1920x1080@120Hz */
@@ -1154,72 +1154,72 @@ static const struct drm_display_mode edid_cea_modes[] = { 
	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4896,

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

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},

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

	/* 95 - 3840x2160p@30Hz 16:9 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4016,

		   4104, 4400, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},

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

	/* 96 - 3840x2160p@50Hz 16:9 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4896,

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

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},

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

	/* 97 - 3840x2160p@60Hz 16:9 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4016,

		   4104, 4400, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},

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

	/* 98 - 4096x2160p@24Hz 256:135 */

	{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 297000, 4096, 5116,

		   5204, 5500, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},

	  .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },

	/* 99 - 4096x2160p@25Hz 256:135 */

	{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 297000, 4096, 5064,

		   5152, 5280, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},

	  .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },

	/* 100 - 4096x2160p@30Hz 256:135 */

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

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

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},

	  .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },

	/* 101 - 4096x2160p@50Hz 256:135 */

	{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 594000, 4096, 5064,

		   5152, 5280, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},

	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },

	/* 102 - 4096x2160p@60Hz 256:135 */

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

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

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},

	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },

	/* 103 - 3840x2160p@24Hz 64:27 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 5116,

		   5204, 5500, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},

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

	/* 104 - 3840x2160p@25Hz 64:27 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4016,

		4104, 4400, 0, 2160, 2168, 2178, 2250, 0,

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4896,

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

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},

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

	/* 105 - 3840x2160p@30Hz 64:27 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4016,

		   4104, 4400, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},

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

	/* 106 - 3840x2160p@50Hz 64:27 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4896,

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

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},

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

	/* 107 - 3840x2160p@60Hz 64:27 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4016,

		   4104, 4400, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},

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

};



/*