WebSVN – Kolibri OS – Diff – /drivers/video/drm/drm_edid.c

 #define EDID_QUIRK_FORCE_REDUCED_BLANKING	(1 << 7)
 /* Force 8bpc */
 #define EDID_QUIRK_FORCE_8BPC			(1 << 8)
 /* Force 12bpc */
 #define EDID_QUIRK_FORCE_12BPC			(1 << 9)
-/* Force 6bpc */
-#define EDID_QUIRK_FORCE_6BPC			(1 << 10)
-/* Force 10bpc */
-#define EDID_QUIRK_FORCE_10BPC			(1 << 11)
 struct detailed_mode_closure {
 	struct drm_connector *connector;
 	struct edid *edid;
 	/* Acer F51 */
 	{ "API", 0x7602, EDID_QUIRK_PREFER_LARGE_60 },
 	/* Unknown Acer */
 	{ "ACR", 2423, EDID_QUIRK_FIRST_DETAILED_PREFERRED },
-	/* AEO model 0 reports 8 bpc, but is a 6 bpc panel */
-	{ "AEO", 0, EDID_QUIRK_FORCE_6BPC },
 	/* Belinea 10 15 55 */
 	{ "MAX", 1516, EDID_QUIRK_PREFER_LARGE_60 },
 	{ "MAX", 0x77e, EDID_QUIRK_PREFER_LARGE_60 },
 	/* Funai Electronics PM36B */
 	{ "FCM", 13600, EDID_QUIRK_PREFER_LARGE_75 |
-	  EDID_QUIRK_DETAILED_IN_CM },
-	/* LGD panel of HP zBook 17 G2, eDP 10 bpc, but reports unknown bpc */
-	{ "LGD", 764, EDID_QUIRK_FORCE_10BPC },
+	  EDID_QUIRK_DETAILED_IN_CM },
 	/* LG Philips LCD LP154W01-A5 */
 	{ "LPL", 0, EDID_QUIRK_DETAILED_USE_MAXIMUM_SIZE },
 	/* Medion MD 30217 PG */
 	{ "MED", 0x7b8, EDID_QUIRK_PREFER_LARGE_75 },
 	/* Panel in Samsung NP700G7A-S01PL notebook reports 6bpc */
-	{ "SEC", 0xd033, EDID_QUIRK_FORCE_8BPC },
-	/* Rotel RSX-1058 forwards sink's EDID but only does HDMI 1.1*/
-	{ "ETR", 13896, EDID_QUIRK_FORCE_8BPC },
+	{ "SEC", 0xd033, EDID_QUIRK_FORCE_8BPC },
 };
 /*
 };
 /*
  * Probably taken from CEA-861 spec.
+ * This table is converted from xorg's hw/xfree86/modes/xf86EdidModes.c.
+ *
- * This table is converted from xorg's hw/xfree86/modes/xf86EdidModes.c.
+ * Index using the VIC.
  */
+static const struct drm_display_mode edid_cea_modes[] = {
+	/* 0 - dummy, VICs start at 1 */
-static const struct drm_display_mode edid_cea_modes[] = {
+	{ },
 	/* 1 - 640x480@60Hz */
 	{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 25175, 640, 656,
 , 800, 0, 480, 490, 492, 525, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC),
 		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
 	 .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
 };
 /*
- * HDMI 1.4 4k modes.
+ * HDMI 1.4 4k modes. Index using the VIC.
  */
+static const struct drm_display_mode edid_4k_modes[] = {
+	/* 0 - dummy, VICs start at 1 */
-static const struct drm_display_mode edid_4k_modes[] = {
+	{ },
 	/* 1 - 3840x2160@30Hz */
 	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000,
 , 4016, 4104, 4400, 0,
 , 2168, 2178, 2250, 0,
 		clock = DIV_ROUND_CLOSEST(clock * 1000, 1001);
 	return clock;
+}
+static u8 drm_match_cea_mode_clock_tolerance(const struct drm_display_mode *to_match,
+					     unsigned int clock_tolerance)
+{
+	u8 vic;
+	if (!to_match->clock)
+		return 0;
+	for (vic = 1; vic < ARRAY_SIZE(edid_cea_modes); vic++) {
+		const struct drm_display_mode *cea_mode = &edid_cea_modes[vic];
+		unsigned int clock1, clock2;
+		/* Check both 60Hz and 59.94Hz */
+		clock1 = cea_mode->clock;
+		clock2 = cea_mode_alternate_clock(cea_mode);
+		if (abs(to_match->clock - clock1) > clock_tolerance &&
+		    abs(to_match->clock - clock2) > clock_tolerance)
+			continue;
+		if (drm_mode_equal_no_clocks(to_match, cea_mode))
+			return vic;
+	}
+	return 0;
+}
 /**
  * drm_match_cea_mode - look for a CEA mode matching given mode
  * @to_match: display mode
+ *
  * Return: The CEA Video ID (VIC) of the mode or 0 if it isn't a CEA-861
  * mode.
  */
 u8 drm_match_cea_mode(const struct drm_display_mode *to_match)
+{
-	u8 mode;
+	u8 vic;
 	if (!to_match->clock)
 		return 0;
-	for (mode = 0; mode < ARRAY_SIZE(edid_cea_modes); mode++) {
+	for (vic = 1; vic < ARRAY_SIZE(edid_cea_modes); vic++) {
-		const struct drm_display_mode *cea_mode = &edid_cea_modes[mode];
+		const struct drm_display_mode *cea_mode = &edid_cea_modes[vic];
 		unsigned int clock1, clock2;
 		/* Check both 60Hz and 59.94Hz */
 		clock1 = cea_mode->clock;
 		clock2 = cea_mode_alternate_clock(cea_mode);
 		if ((KHZ2PICOS(to_match->clock) == KHZ2PICOS(clock1) ||
 		     KHZ2PICOS(to_match->clock) == KHZ2PICOS(clock2)) &&
+		    drm_mode_equal_no_clocks_no_stereo(to_match, cea_mode))
+			return vic;
+	}
+	return 0;
+}
-		    drm_mode_equal_no_clocks_no_stereo(to_match, cea_mode))
+EXPORT_SYMBOL(drm_match_cea_mode);
 			return mode + 1;
 static bool drm_valid_cea_vic(u8 vic)
 	return 0;
 	return vic > 0 && vic < ARRAY_SIZE(edid_cea_modes);
 EXPORT_SYMBOL(drm_match_cea_mode);
 /**
  * drm_get_cea_aspect_ratio - get the picture aspect ratio corresponding to
- * the input VIC from the CEA mode list
- * @video_code: ID given to each of the CEA modes
- *
- * Returns picture aspect ratio
+ * the input VIC from the CEA mode list
- */
+ * @video_code: ID given to each of the CEA modes
 enum hdmi_picture_aspect drm_get_cea_aspect_ratio(const u8 video_code)
  * Returns picture aspect ratio
-	/* return picture aspect ratio for video_code - 1 to access the
+ */
 		return hdmi_mode->clock;
 	return cea_mode_alternate_clock(hdmi_mode);
+}
+static u8 drm_match_hdmi_mode_clock_tolerance(const struct drm_display_mode *to_match,
+					      unsigned int clock_tolerance)
+{
+	u8 vic;
+	if (!to_match->clock)
+		return 0;
+	for (vic = 1; vic < ARRAY_SIZE(edid_4k_modes); vic++) {
+		const struct drm_display_mode *hdmi_mode = &edid_4k_modes[vic];
+		unsigned int clock1, clock2;
+		/* Make sure to also match alternate clocks */
+		clock1 = hdmi_mode->clock;
+		clock2 = hdmi_mode_alternate_clock(hdmi_mode);
+		if (abs(to_match->clock - clock1) > clock_tolerance &&
+		    abs(to_match->clock - clock2) > clock_tolerance)
+			continue;
+		if (drm_mode_equal_no_clocks(to_match, hdmi_mode))
+			return vic;
+	}
+	return 0;
+}
 /*
  * drm_match_hdmi_mode - look for a HDMI mode matching given mode
  * @to_match: display mode
+ *
  * An HDMI mode is one defined in the HDMI vendor specific block.
+ *
  * Returns the HDMI Video ID (VIC) of the mode or 0 if it isn't one.
  */
 static u8 drm_match_hdmi_mode(const struct drm_display_mode *to_match)
+{
-	u8 mode;
+	u8 vic;
 	if (!to_match->clock)
 		return 0;
-	for (mode = 0; mode < ARRAY_SIZE(edid_4k_modes); mode++) {
+	for (vic = 1; vic < ARRAY_SIZE(edid_4k_modes); vic++) {
-		const struct drm_display_mode *hdmi_mode = &edid_4k_modes[mode];
+		const struct drm_display_mode *hdmi_mode = &edid_4k_modes[vic];
 		unsigned int clock1, clock2;
 		/* Make sure to also match alternate clocks */
 		clock1 = hdmi_mode->clock;
 		clock2 = hdmi_mode_alternate_clock(hdmi_mode);
 		if ((KHZ2PICOS(to_match->clock) == KHZ2PICOS(clock1) ||
+		     KHZ2PICOS(to_match->clock) == KHZ2PICOS(clock2)) &&
+		    drm_mode_equal_no_clocks_no_stereo(to_match, hdmi_mode))
+			return vic;
+	}
+	return 0;
 		     KHZ2PICOS(to_match->clock) == KHZ2PICOS(clock2)) &&
 		    drm_mode_equal_no_clocks_no_stereo(to_match, hdmi_mode))
-			return mode + 1;
+static bool drm_valid_hdmi_vic(u8 vic)
+{
-	return 0;
+	return vic > 0 && vic < ARRAY_SIZE(edid_4k_modes);
 	 * with the alternate clock for certain CEA modes.
 	 */
 	list_for_each_entry(mode, &connector->probed_modes, head) {
 		const struct drm_display_mode *cea_mode = NULL;
 		struct drm_display_mode *newmode;
-		u8 mode_idx = drm_match_cea_mode(mode) - 1;
+		u8 vic = drm_match_cea_mode(mode);
 		unsigned int clock1, clock2;
-		if (mode_idx < ARRAY_SIZE(edid_cea_modes)) {
+		if (drm_valid_cea_vic(vic)) {
-			cea_mode = &edid_cea_modes[mode_idx];
+			cea_mode = &edid_cea_modes[vic];
 			clock2 = cea_mode_alternate_clock(cea_mode);
 		} else {
-			mode_idx = drm_match_hdmi_mode(mode) - 1;
+			vic = drm_match_hdmi_mode(mode);
-			if (mode_idx < ARRAY_SIZE(edid_4k_modes)) {
+			if (drm_valid_hdmi_vic(vic)) {
-				cea_mode = &edid_4k_modes[mode_idx];
+				cea_mode = &edid_4k_modes[vic];
 				clock2 = hdmi_mode_alternate_clock(cea_mode);
+			}
+		}
 				const u8 *video_db, u8 video_len,
 				u8 video_index)
+{
 	struct drm_device *dev = connector->dev;
 	struct drm_display_mode *newmode;
-	u8 cea_mode;
+	u8 vic;
 	if (video_db == NULL || video_index >= video_len)
 		return NULL;
 	/* CEA modes are numbered 1..127 */
-	cea_mode = (video_db[video_index] & 127) - 1;
+	vic = (video_db[video_index] & 127);
-	if (cea_mode >= ARRAY_SIZE(edid_cea_modes))
+	if (!drm_valid_cea_vic(vic))
 		return NULL;
-	newmode = drm_mode_duplicate(dev, &edid_cea_modes[cea_mode]);
+	newmode = drm_mode_duplicate(dev, &edid_cea_modes[vic]);
 static int add_hdmi_mode(struct drm_connector *connector, u8 vic)
+{
 	struct drm_device *dev = connector->dev;
 	struct drm_display_mode *newmode;
-	vic--; /* VICs start at 1 */
-	if (vic >= ARRAY_SIZE(edid_4k_modes)) {
+	if (!drm_valid_hdmi_vic(vic)) {
 		DRM_ERROR("Unknown HDMI VIC: %d\n", vic);
 		return 0;
+	}
 static void fixup_detailed_cea_mode_clock(struct drm_display_mode *mode)
+{
 	const struct drm_display_mode *cea_mode;
 	int clock1, clock2, clock;
-	u8 mode_idx;
+	u8 vic;
+	const char *type;
+	/*
+	 * allow 5kHz clock difference either way to account for
-	const char *type;
+	 * the 10kHz clock resolution limit of detailed timings.
+	 */
-	mode_idx = drm_match_cea_mode(mode) - 1;
+	vic = drm_match_cea_mode_clock_tolerance(mode, 5);
-	if (mode_idx < ARRAY_SIZE(edid_cea_modes)) {
+	if (drm_valid_cea_vic(vic)) {
 		type = "CEA";
-		cea_mode = &edid_cea_modes[mode_idx];
+		cea_mode = &edid_cea_modes[vic];
 		clock1 = cea_mode->clock;
 		clock2 = cea_mode_alternate_clock(cea_mode);
 	} else {
-		mode_idx = drm_match_hdmi_mode(mode) - 1;
+		vic = drm_match_hdmi_mode_clock_tolerance(mode, 5);
-		if (mode_idx < ARRAY_SIZE(edid_4k_modes)) {
+		if (drm_valid_hdmi_vic(vic)) {
 			type = "HDMI";
-			cea_mode = &edid_4k_modes[mode_idx];
+			cea_mode = &edid_4k_modes[vic];
 			clock1 = cea_mode->clock;
 			clock2 = hdmi_mode_alternate_clock(cea_mode);
 		} else {
 	if (mode->clock == clock)
 		return;
 	DRM_DEBUG("detailed mode matches %s VIC %d, adjusting clock %d -> %d\n",
-		  type, mode_idx + 1, mode->clock, clock);
+		  type, vic, mode->clock, clock);
 	mode->clock = clock;
+}
 	if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75))
 		edid_fixup_preferred(connector, quirks);
-	drm_add_display_info(edid, &connector->display_info, connector);
-	if (quirks & EDID_QUIRK_FORCE_6BPC)
-		connector->display_info.bpc = 6;
+	drm_add_display_info(edid, &connector->display_info, connector);
-	if (quirks & EDID_QUIRK_FORCE_8BPC)
-		connector->display_info.bpc = 8;
-	if (quirks & EDID_QUIRK_FORCE_10BPC)
+	if (quirks & EDID_QUIRK_FORCE_8BPC)
-		connector->display_info.bpc = 10;
+		connector->display_info.bpc = 8;
 	if (quirks & EDID_QUIRK_FORCE_12BPC)

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/drm_edid.c – Rev 6935 → 6937