Allows tools like GNOME's monitor configuration to show meaningful names.
Signed-off-by: Lucas Stach <d...@lynxeye.de>
---
src/gallium/state_trackers/xorg/xorg_output.c | 32 ++++++++++++++++++++++++-
1 Datei geändert, 31 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)
diff --git a/src/gallium/state_trackers/xorg/xorg_output.c
b/src/gallium/state_trackers/xorg/xorg_output.c
index 5555b51..d851383 100644
--- a/src/gallium/state_trackers/xorg/xorg_output.c
+++ b/src/gallium/state_trackers/xorg/xorg_output.c
@@ -32,6 +32,7 @@
#include <xf86.h>
#include <xf86i2c.h>
#include <xf86Crtc.h>
+#include <xf86DDC.h>
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
@@ -54,7 +55,8 @@
struct output_private
{
drmModeConnectorPtr drm_connector;
-
+ drmModePropertyBlobPtr edid_blob;
+ int fd;
int c;
};
@@ -122,9 +124,34 @@ output_get_modes(xf86OutputPtr output)
struct output_private *priv = output->driver_private;
drmModeConnectorPtr drm_connector = priv->drm_connector;
drmModeModeInfoPtr drm_mode = NULL;
+ drmModePropertyPtr props = NULL;
+ xf86MonPtr ddc_mon = NULL;
DisplayModePtr modes = NULL, mode = NULL;
int i;
+ for (i = 0; i < drm_connector->count_props; i++) {
+ props = drmModeGetProperty(priv->fd, drm_connector->props[i]);
+ if (!props || !(props->flags & DRM_MODE_PROP_BLOB))
+ continue;
+
+ if (!strcmp(props->name, "EDID")) {
+ if (priv->edid_blob)
+ drmModeFreePropertyBlob(priv->edid_blob);
+ priv->edid_blob = drmModeGetPropertyBlob(priv->fd,
+
drm_connector->prop_values[i]);
+ }
+ drmModeFreeProperty(props);
+ }
+
+ if (priv->edid_blob) {
+ ddc_mon = xf86InterpretEDID(output->scrn->scrnIndex,
+
priv->edid_blob->data);
+
+ if (ddc_mon && priv->edid_blob->length > 128)
+ ddc_mon->flags |= MONITOR_EDID_COMPLETE_RAWDATA;
+ }
+ xf86OutputSetEDID(output, ddc_mon);
+
for (i = 0; i < drm_connector->count_modes; i++) {
drm_mode = &drm_connector->modes[i];
if (drm_mode) {
@@ -194,6 +221,8 @@ static void
output_destroy(xf86OutputPtr output)
{
struct output_private *priv = output->driver_private;
+ if (priv->edid_blob)
+ drmModeFreePropertyBlob(priv->edid_blob);
drmModeFreeConnector(priv->drm_connector);
free(priv);
output->driver_private = NULL;
@@ -283,6 +312,7 @@ xorg_output_init(ScrnInfoPtr pScrn)
}
priv->c = c;
priv->drm_connector = drm_connector;
+ priv->fd = ms->fd;
output->driver_private = priv;
output->subpixel_order = SubPixelHorizontalRGB;
output->interlaceAllowed = FALSE;
--
1.7.10.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
