drm/vmwgfx: Add suggested screen x and y connector properties

Introduced by qxl, add these properties as a generic way to tell a
display manager about the GUI layout.

Also add the hotplug_mode_update_property which advises display managers to
reread the mode list on a hotplug event.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index b92521d70efc692238ea98b5eb5153873254179b..13970fe6bb8690302ca7ef1548744d2493941708 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@ -408,6 +408,7 @@ struct vmw_private {
        enum vmw_display_unit_type active_display_unit;
        struct vmw_legacy_display *ldu_priv;
        struct vmw_overlay *overlay_priv;
+       struct drm_property *hotplug_mode_update_property;
        unsigned num_implicit;
        struct vmw_framebuffer *implicit_fb;
 

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index 26c2e9edb2b6c4db9b245f2e47f434b81261a99f..6726294dfccb96683cc408debaf302184bdf5831 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -1108,6 +1108,22 @@ int vmw_kms_present(struct vmw_private *dev_priv,
        return 0;
 }
 
+static void
+vmw_kms_create_hotplug_mode_update_property(struct vmw_private *dev_priv)
+{
+       if (dev_priv->hotplug_mode_update_property)
+               return;
+
+       dev_priv->hotplug_mode_update_property =
+               drm_property_create_range(dev_priv->dev,
+                                         DRM_MODE_PROP_IMMUTABLE,
+                                         "hotplug_mode_update", 0, 1);
+
+       if (!dev_priv->hotplug_mode_update_property)
+               return;
+
+}
+
 int vmw_kms_init(struct vmw_private *dev_priv)
 {
        struct drm_device *dev = dev_priv->dev;
@@ -1120,6 +1136,9 @@ int vmw_kms_init(struct vmw_private *dev_priv)
        dev->mode_config.max_width = dev_priv->texture_max_width;
        dev->mode_config.max_height = dev_priv->texture_max_height;
 
+       drm_mode_create_suggested_offset_properties(dev);
+       vmw_kms_create_hotplug_mode_update_property(dev_priv);
+
        ret = vmw_kms_stdu_init_display(dev_priv);
        if (ret) {
                ret = vmw_kms_sou_init_display(dev_priv);
@@ -1359,15 +1378,28 @@ static int vmw_du_update_layout(struct vmw_private *dev_priv, unsigned num,
                        du->pref_active = true;
                        du->gui_x = rects[du->unit].x;
                        du->gui_y = rects[du->unit].y;
+                       drm_object_property_set_value
+                         (&con->base, dev->mode_config.suggested_x_property,
+                          du->gui_x);
+                       drm_object_property_set_value
+                         (&con->base, dev->mode_config.suggested_y_property,
+                          du->gui_y);
                } else {
                        du->pref_width = 800;
                        du->pref_height = 600;
                        du->pref_active = false;
+                       drm_object_property_set_value
+                         (&con->base, dev->mode_config.suggested_x_property,
+                          0);
+                       drm_object_property_set_value
+                         (&con->base, dev->mode_config.suggested_y_property,
+                          0);
                }
                con->status = vmw_du_connector_detect(con, true);
        }
 
        mutex_unlock(&dev->mode_config.mutex);
+       drm_sysfs_hotplug_event(dev);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
index b6fa44fe8929e3eef1cd91a5beb09b21f37e72a5..8fb17b8f6a8c41ac564d9f2d4f8aa9183f847765 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
@@ -375,8 +375,14 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
        drm_mode_crtc_set_gamma_size(crtc, 256);
 
        drm_object_attach_property(&connector->base,
-                                     dev->mode_config.dirty_info_property,
-                                     1);
+                                  dev->mode_config.dirty_info_property,
+                                  1);
+       drm_object_attach_property(&connector->base,
+                                  dev_priv->hotplug_mode_update_property, 1);
+       drm_object_attach_property(&connector->base,
+                                  dev->mode_config.suggested_x_property, 0);
+       drm_object_attach_property(&connector->base,
+                                  dev->mode_config.suggested_y_property, 0);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
index c11b196bf35f293fe8739816a86cab1bc8d8d692..1390cfface25f6486e9dc6603918be57177df3f1 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
@@ -533,8 +533,14 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)
        drm_mode_crtc_set_gamma_size(crtc, 256);
 
        drm_object_attach_property(&connector->base,
-                                     dev->mode_config.dirty_info_property,
-                                     1);
+                                  dev->mode_config.dirty_info_property,
+                                  1);
+       drm_object_attach_property(&connector->base,
+                                  dev_priv->hotplug_mode_update_property, 1);
+       drm_object_attach_property(&connector->base,
+                                  dev->mode_config.suggested_x_property, 0);
+       drm_object_attach_property(&connector->base,
+                                  dev->mode_config.suggested_y_property, 0);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
index a5ab826879d11dab84eb4bdb1bda7612dc58ea1c..f02bb702c2826ef77ca84a8ad3c42f2bf534aebb 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
@@ -1128,6 +1128,12 @@ static int vmw_stdu_init(struct vmw_private *dev_priv, unsigned unit)
        drm_object_attach_property(&connector->base,
                                   dev->mode_config.dirty_info_property,
                                   1);
+       drm_object_attach_property(&connector->base,
+                                  dev_priv->hotplug_mode_update_property, 1);
+       drm_object_attach_property(&connector->base,
+                                  dev->mode_config.suggested_x_property, 0);
+       drm_object_attach_property(&connector->base,
+                                  dev->mode_config.suggested_y_property, 0);
 
        return 0;
 }