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

  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-//#include
+#include
-#include
-#include
 #include
 #include
 #include "drmP.h"
 #include "drm_edid.h"
 	{ "SAM", 638, EDID_QUIRK_PREFER_LARGE_60 },
 };
+/* Valid EDID header has these bytes */
+static const u8 edid_header[] = {
-/* Valid EDID header has these bytes */
+x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
-static u8 edid_header[] = { 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00 };
+};
 /**
 			break;
+		}
+	}
 	return mode;
+}
+/*
+ * 0 is reserved.  The spec says 0x01 fill for unused timings.  Some old
+ * monitors fill with ascii space (0x20) instead.
+ */
+static int
+bad_std_timing(u8 a, u8 b)
+{
+	return (a == 0x00 && b == 0x00) ||
+	       (a == 0x01 && b == 0x01) ||
+	       (a == 0x20 && b == 0x20);
+}
 /**
  * drm_mode_std - convert standard mode info (width, height, refresh) into mode
  * @t: standard timing params
+ * @timing_level: standard timing level
+ *
  * Take the standard timing params (in this case width, aspect, and refresh)
- * and convert them into a real mode using CVT.
+ * and convert them into a real mode using CVT/GTF/DMT.
+ *
  * Punts for now, but should eventually use the FB layer's CVT based mode
  * generation code.
  */
 struct drm_display_mode *drm_mode_std(struct drm_device *dev,
 				      struct std_timing *t,
+				      int revision,
 				      int timing_level)
+{
 	struct drm_display_mode *mode;
 	int hsize, vsize;
 	int vrefresh_rate;
 	unsigned aspect_ratio = (t->vfreq_aspect & EDID_TIMING_ASPECT_MASK)
 		>> EDID_TIMING_ASPECT_SHIFT;
 	unsigned vfreq = (t->vfreq_aspect & EDID_TIMING_VFREQ_MASK)
 		>> EDID_TIMING_VFREQ_SHIFT;
+	if (bad_std_timing(t->hsize, t->vfreq_aspect))
+		return NULL;
 	/* According to the EDID spec, the hdisplay = hsize * 8 + 248 */
 	hsize = t->hsize * 8 + 248;
 	/* vrefresh_rate = vfreq + 60 */
 	vrefresh_rate = vfreq + 60;
-	/* the vdisplay is calculated based on the aspect ratio */
+	/* the vdisplay is calculated based on the aspect ratio */
+	if (aspect_ratio == 0) {
+		if (revision < 3)
+			vsize = hsize;
-	if (aspect_ratio == 0)
+		else
 		vsize = (hsize * 10) / 16;
-	else if (aspect_ratio == 1)
+	} else if (aspect_ratio == 1)
 		vsize = (hsize * 3) / 4;
 	else if (aspect_ratio == 2)
 		vsize = (hsize * 4) / 5;
 	else
 		vsize = (hsize * 9) / 16;
 	/* HDTV hack */
 	if (hsize == 1360 && vsize == 765 && vrefresh_rate == 60) {
+		mode = drm_cvt_mode(dev, hsize, vsize, vrefresh_rate, 0, 0,
-		mode = drm_cvt_mode(dev, hsize, vsize, vrefresh_rate, 0, 0);
+				    false);
 		mode->hdisplay = 1366;
 		mode->vsync_start = mode->vsync_start - 1;
 		mode->vsync_end = mode->vsync_end - 1;
 		return mode;
 		break;
 	case LEVEL_GTF:
 		mode = drm_gtf_mode(dev, hsize, vsize, vrefresh_rate, 0, 0);
 		break;
 	case LEVEL_CVT:
-		mode = drm_cvt_mode(dev, hsize, vsize, vrefresh_rate, 0, 0);
+		mode = drm_cvt_mode(dev, hsize, vsize, vrefresh_rate, 0, 0,
+				    false);
 		break;
+	}
 	return mode;
+}
 		/* If std timings bytes are 1, 1 it's empty */
 		if (t->hsize == 1 && t->vfreq_aspect == 1)
 			continue;
 		newmode = drm_mode_std(dev, &edid->standard_timings[i],
-					timing_level);
+				       edid->revision, timing_level);
 		if (newmode) {
 			drm_mode_probed_add(connector, newmode);
 			modes++;
+		}
 		case EDID_DETAIL_MONITOR_NAME:
 			break;
 		case EDID_DETAIL_MONITOR_CPDATA:
 			break;
 		case EDID_DETAIL_STD_MODES:
-			/* Five modes per detailed section */
-			for (j = 0; j < 5; i++) {
+				for (j = 0; j < 6; i++) {
 				struct std_timing *std;
 				struct drm_display_mode *newmode;
 				std = &data->data.timings[j];
+					newmode = drm_mode_std(dev, std,
-					newmode = drm_mode_std(dev, std,
+							       edid->revision,
 							       timing_level);
 				if (newmode) {
 					drm_mode_probed_add(connector, newmode);
 					modes++;
 			for (j = 0; j < 5; i++) {
 				struct std_timing *std;
 				struct drm_display_mode *newmode;
 				std = &data->data.timings[j];
+				newmode = drm_mode_std(dev, std,
+						       edid->revision,
-				newmode = drm_mode_std(dev, std, timing_level);
+						       timing_level);
 				if (newmode) {
 					drm_mode_probed_add(connector, newmode);
 					modes++;
+				}
 	};
 	if (i2c_transfer(adapter, msgs, 2) == 2)
-		return 0;
 		return 0;
 //   dev_info(&adapter->dev, "unable to read EDID block.\n");
 	return -1;
+}

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/drm_edid.c – Rev 1179 → 1221