Commit 4a1897d2 authored by Russell King - ARM Linux's avatar Russell King - ARM Linux Committed by Dave Airlie
Browse files

drm: consistently name interlaced modes 



At the moment, there is an inconsistency in the way modes are named.
Modes with timings parsed from the EDID information will call
drm_mode_set_name(), which will name the mode using this form:

	<horizontal-res>x<vertical-res><interlace-char>

eg, 1920x1080i for an interlaced mode, or 1920x1080 for a progressive
mode.

However, timings parsed using the tables in drm_edid_modes.h do not
have the 'i' suffix.  You are left to deduce that they're interlaced
from xrandr's output by the lower vertical refresh frequencies.

This patch changes the interlaced mode names in drm_edid_modes.h to
follow the style set by drm_mode_set_name(), which makes it clear
in xrandr which modes are interlaced and which are not (as xrandr
groups the refresh rates on a line according to the name field.)

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent fb30edf5

drivers/gpu/drm/drm_edid_modes.h

+21 −21
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static const struct drm_display_mode drm_dmt_modes[] = { 
		   976, 1088, 0, 480, 486, 494, 517, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },

	/* 1024x768@43Hz, interlace */

	{ DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 44900, 1024, 1032,

	{ DRM_MODE("1024x768i", DRM_MODE_TYPE_DRIVER, 44900, 1024, 1032,

		   1208, 1264, 0, 768, 768, 772, 817, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |

			DRM_MODE_FLAG_INTERLACE) },
@@ -395,7 +395,7 @@ static const struct drm_display_mode edid_est_modes[] = { 
	{ DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 65000, 1024, 1048,

		   1184, 1344, 0,  768, 771, 777, 806, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, /* 1024x768@60Hz */

	{ DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER,44900, 1024, 1032,

	{ DRM_MODE("1024x768i", DRM_MODE_TYPE_DRIVER,44900, 1024, 1032,

		   1208, 1264, 0, 768, 768, 776, 817, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC | DRM_MODE_FLAG_INTERLACE) }, /* 1024x768@43Hz */

	{ DRM_MODE("832x624", DRM_MODE_TYPE_DRIVER, 57284, 832, 864,
@@ -506,17 +506,17 @@ static const struct drm_display_mode edid_cea_modes[] = { 
		   1430, 1650, 0, 720, 725, 730, 750, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },

	/* 5 - 1920x1080i@60Hz */

	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2008,

	{ DRM_MODE("1920x1080i", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2008,

		   2052, 2200, 0, 1080, 1084, 1094, 1125, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |

			DRM_MODE_FLAG_INTERLACE) },

	/* 6 - 1440x480i@60Hz */

	{ DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,

	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,

		   1602, 1716, 0, 480, 488, 494, 525, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK) },

	/* 7 - 1440x480i@60Hz */

	{ DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,

	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,

		   1602, 1716, 0, 480, 488, 494, 525, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK) },
@@ -531,12 +531,12 @@ static const struct drm_display_mode edid_cea_modes[] = { 
		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_DBLCLK) },

	/* 10 - 2880x480i@60Hz */

	{ DRM_MODE("2880x480", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2956,

	{ DRM_MODE("2880x480i", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2956,

		   3204, 3432, 0, 480, 488, 494, 525, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE) },

	/* 11 - 2880x480i@60Hz */

	{ DRM_MODE("2880x480", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2956,

	{ DRM_MODE("2880x480i", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2956,

		   3204, 3432, 0, 480, 488, 494, 525, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE) },
@@ -573,17 +573,17 @@ static const struct drm_display_mode edid_cea_modes[] = { 
		   1760, 1980, 0, 720, 725, 730, 750, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },

	/* 20 - 1920x1080i@50Hz */

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

	{ DRM_MODE("1920x1080i", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2448,

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

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |

			DRM_MODE_FLAG_INTERLACE) },

	/* 21 - 1440x576i@50Hz */

	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,

	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,

		   1590, 1728, 0, 576, 580, 586, 625, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK) },

	/* 22 - 1440x576i@50Hz */

	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,

	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,

		   1590, 1728, 0, 576, 580, 586, 625, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK) },
@@ -598,12 +598,12 @@ static const struct drm_display_mode edid_cea_modes[] = { 
		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_DBLCLK) },

	/* 25 - 2880x576i@50Hz */

	{ DRM_MODE("2880x576", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2928,

	{ DRM_MODE("2880x576i", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2928,

		   3180, 3456, 0, 576, 580, 586, 625, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE) },

	/* 26 - 2880x576i@50Hz */

	{ DRM_MODE("2880x576", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2928,

	{ DRM_MODE("2880x576i", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2928,

		   3180, 3456, 0, 576, 580, 586, 625, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE) },
@@ -656,12 +656,12 @@ static const struct drm_display_mode edid_cea_modes[] = { 
		   3184, 3456, 0, 576, 581, 586, 625, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },

	/* 39 - 1920x1080i@50Hz */

	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 72000, 1920, 1952,

	{ DRM_MODE("1920x1080i", DRM_MODE_TYPE_DRIVER, 72000, 1920, 1952,

		   2120, 2304, 0, 1080, 1126, 1136, 1250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE) },

	/* 40 - 1920x1080i@100Hz */

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

	{ DRM_MODE("1920x1080i", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2448,

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

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |

			DRM_MODE_FLAG_INTERLACE) },
@@ -688,7 +688,7 @@ static const struct drm_display_mode edid_cea_modes[] = { 
		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_DBLCLK) },

	/* 46 - 1920x1080i@120Hz */

	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2008,

	{ DRM_MODE("1920x1080i", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2008,

		   2052, 2200, 0, 1080, 1084, 1094, 1125, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |

			DRM_MODE_FLAG_INTERLACE) },
@@ -705,12 +705,12 @@ static const struct drm_display_mode edid_cea_modes[] = { 
		   798, 858, 0, 480, 489, 495, 525, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },

	/* 50 - 1440x480i@120Hz */

	{ DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1478,

	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1478,

		   1602, 1716, 0, 480, 488, 494, 525, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK) },

	/* 51 - 1440x480i@120Hz */

	{ DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1478,

	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1478,

		   1602, 1716, 0, 480, 488, 494, 525, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK) },
@@ -723,12 +723,12 @@ static const struct drm_display_mode edid_cea_modes[] = { 
		   796, 864, 0, 576, 581, 586, 625, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },

	/* 54 - 1440x576i@200Hz */

	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1464,

	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1464,

		   1590, 1728, 0, 576, 580, 586, 625, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK) },

	/* 55 - 1440x576i@200Hz */

	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1464,

	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1464,

		   1590, 1728, 0, 576, 580, 586, 625, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK) },
@@ -741,12 +741,12 @@ static const struct drm_display_mode edid_cea_modes[] = { 
		   798, 858, 0, 480, 489, 495, 525, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },

	/* 58 - 1440x480i@240 */

	{ DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1478,

	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1478,

		   1602, 1716, 0, 480, 488, 494, 525, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK) },

	/* 59 - 1440x480i@240 */

	{ DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1478,

	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1478,

		   1602, 1716, 0, 480, 488, 494, 525, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK) },

CRA Git | Maintained and supported by SUSTech CRA and CCSE