gamma-linux-drm: do not attemp to read monitor info if there is no monitor

Signed-off-by: Mattias Andrée <maandree@operamail.com>

2 files changed, 46 insertions, 26 deletions

diff --git a/src/gamma-linux-drm.c b/src/gamma-linux-drm.c
index 4ac0022..e0e9b74 100644
--- a/src/gamma-linux-drm.c
+++ b/src/gamma-linux-drm.c
@@ -491,10 +491,39 @@ static int read_connector_data(libgamma_crtc_state_t* restrict crtc, libgamma_cr
   if ((fields & (CRTC_INFO_WIDTH_MM | CRTC_INFO_HEIGHT_MM | CRTC_INFO_CONNECTOR_TYPE |
 		 CRTC_INFO_ACTIVE | CRTC_INFO_SUBPIXEL_ORDER)))
     {
+      /* Get whether or not a monitor is plugged in. */
+      out->active = connector->connection == DRM_MODE_CONNECTED;
+      out->active_error = connector->connection == DRM_MODE_UNKNOWNCONNECTION ? LIBGAMMA_STATE_UNKNOWN : 0;
+      if (out->active == 0)
+	{
+	  if ((fields & (CRTC_INFO_WIDTH_MM | CRTC_INFO_HEIGHT_MM | CRTC_INFO_SUBPIXEL_ORDER)))
+	    out->width_mm_error = out->height_mm_error = out->subpixel_order_error = LIBGAMMA_NOT_CONNECTED;
+	  goto not_connected;
+	}
+      
       /* Get viewport dimension. */
       out->width_mm = connector->mmWidth;
       out->height_mm = connector->mmHeight;
       
+      /* Get subpixel order. */
+#define __select(value)  \
+  case DRM_MODE_SUBPIXEL_##value:  out->subpixel_order = LIBGAMMA_SUBPIXEL_ORDER_##value;  break
+      switch (connector->subpixel)
+	{
+	__select (UNKNOWN);
+	__select (HORIZONTAL_RGB);
+	__select (HORIZONTAL_BGR);
+	__select (VERTICAL_RGB);
+	__select (VERTICAL_BGR);
+	__select (NONE);
+	default:
+	  out->subpixel_order_error = LIBGAMMA_SUBPIXEL_ORDER_NOT_RECOGNISED;
+	  break;
+	}
+#undef __select
+      
+    not_connected:
+      
       /* Get connector type. */
 #define __select(type, name)  \
   case DRM_MODE_CONNECTOR_##type:  out->connector_type = LIBGAMMA_CONNECTOR_TYPE_##type, connector_name_base = name;  break
@@ -529,27 +558,6 @@ static int read_connector_data(libgamma_crtc_state_t* restrict crtc, libgamma_cr
 	  break;
 	}
 #undef __select
-      
-      /* Get subpixel order. */
-#define __select(value)  \
-  case DRM_MODE_SUBPIXEL_##value:  out->subpixel_order = LIBGAMMA_SUBPIXEL_ORDER_##value;  break
-      switch (connector->subpixel)
-	{
-	__select (UNKNOWN);
-	__select (HORIZONTAL_RGB);
-	__select (HORIZONTAL_BGR);
-	__select (VERTICAL_RGB);
-	__select (VERTICAL_BGR);
-	__select (NONE);
-	default:
-	  out->subpixel_order_error = LIBGAMMA_SUBPIXEL_ORDER_NOT_RECOGNISED;
-	  break;
-	}
-#undef __select
-      
-      /* Get whether or not a monitor is plugged in. */
-      out->active = connector->connection == DRM_MODE_CONNECTED;
-      out->active_error = connector->connection == DRM_MODE_UNKNOWNCONNECTION ? LIBGAMMA_STATE_UNKNOWN : 0;
     }
   
   /* Get the connector's name. */
@@ -651,10 +659,11 @@ int libgamma_linux_drm_get_crtc_information(libgamma_crtc_information_t* restric
     fields |= CRTC_INFO_EDID;
   if ((fields & CRTC_INFO_CONNECTOR_NAME))
     fields |= CRTC_INFO_CONNECTOR_TYPE;
+  if (CRTC_INFO_EDID | CRTC_INFO_WIDTH_MM | CRTC_INFO_HEIGHT_MM | CRTC_INFO_SUBPIXEL_ORDER)
+    fields |= CRTC_INFO_ACTIVE;
   
   /* Figure out whether we require the connector to get all information we want. */
-  require_connector = fields & (CRTC_INFO_EDID | CRTC_INFO_WIDTH_MM | CRTC_INFO_HEIGHT_MM |
-				CRTC_INFO_SUBPIXEL_ORDER | CRTC_INFO_CONNECTOR_TYPE);
+  require_connector = fields & (CRTC_INFO_ACTIVE | CRTC_INFO_CONNECTOR_TYPE);
   
   if (require_connector == 0)
     goto cont;
@@ -667,10 +676,16 @@ int libgamma_linux_drm_get_crtc_information(libgamma_crtc_information_t* restric
 	 = this->width_mm_edid_error = this->height_mm_edid_error = error;
       goto cont;
     }
-  if ((fields & (CRTC_INFO_WIDTH_MM | CRTC_INFO_HEIGHT_MM | CRTC_INFO_SUBPIXEL_ORDER | CRTC_INFO_CONNECTOR_TYPE)))
-    e |= read_connector_data(crtc, this, connector, fields);
+  e |= read_connector_data(crtc, this, connector, fields);
   if ((fields & CRTC_INFO_EDID) == 0)
     goto cont;
+  if (this->active_error || (this->active == 0))
+    {
+      e |= this->edid_error = this->gamma_error
+	 = this->width_mm_edid_error = this->height_mm_edid_error
+	 = LIBGAMMA_NOT_CONNECTED;
+      goto cont;
+    }
   e |= get_edid(crtc, this, connector);
   if (this->edid == NULL)
     {
diff --git a/src/libgamma-error.h b/src/libgamma-error.h
index 87eb4ac..15a913c 100644
--- a/src/libgamma-error.h
+++ b/src/libgamma-error.h
@@ -247,6 +247,11 @@ extern const char* libgamma_group_name;
  */
 #define LIBGAMMA_NULL_PARTITION  (-40)
 
+/**
+ * There is not monitor connected to the connector of the selected CRTC
+ */
+#define LIBGAMMA_NOT_CONNECTED  (-41)
+
 
 
 /**
@@ -254,7 +259,7 @@ extern const char* libgamma_group_name;
  * If this is lower than the number your program thinks it
  * should be sould update your program for new errors.
  */
-#define LIBGAMMA_ERROR_MIN  (-40)
+#define LIBGAMMA_ERROR_MIN  (-41)