drm/vmwgfx: Connector atomic state

Add connector handling functions. Start tracking is_implicity in
the connector state.  Eventually, this field should be tracked
exclusively in a connector state.

Now that plane and connector states have been created, we can also
activate the code that use CRTC state.

Signed-off-by: Sinclair Yeh <syeh@vmware.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index ec0506794dbdc35c6d65a1e91d2e9ddbbafd36d8..0c1241d09d143bc1609a467b403ad0a9d1daa456 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -558,6 +558,81 @@ vmw_du_plane_destroy_state(struct drm_plane *plane,
 }
 
 
+/**
+ * vmw_du_connector_duplicate_state - duplicate connector state
+ * @connector: DRM connector
+ *
+ * Allocates and returns a copy of the connector state (both common and
+ * vmw-specific) for the specified connector.
+ *
+ * Returns: The newly allocated connector state, or NULL on failure.
+ */
+struct drm_connector_state *
+vmw_du_connector_duplicate_state(struct drm_connector *connector)
+{
+       struct drm_connector_state *state;
+       struct vmw_connector_state *vcs;
+
+       if (WARN_ON(!connector->state))
+               return NULL;
+
+       vcs = kmemdup(connector->state, sizeof(*vcs), GFP_KERNEL);
+
+       if (!vcs)
+               return NULL;
+
+       state = &vcs->base;
+
+       __drm_atomic_helper_connector_duplicate_state(connector, state);
+
+       return state;
+}
+
+
+/**
+ * vmw_du_connector_reset - creates a blank vmw connector state
+ * @connector: DRM connector
+ *
+ * Resets the atomic state for @connector by freeing the state pointer (which
+ * might be NULL, e.g. at driver load time) and allocating a new empty state
+ * object.
+ */
+void vmw_du_connector_reset(struct drm_connector *connector)
+{
+       struct vmw_connector_state *vcs;
+
+
+       if (connector->state) {
+               __drm_atomic_helper_connector_destroy_state(connector->state);
+
+               kfree(vmw_connector_state_to_vcs(connector->state));
+       }
+
+       vcs = kzalloc(sizeof(*vcs), GFP_KERNEL);
+
+       if (!vcs) {
+               DRM_ERROR("Cannot allocate vmw_connector_state\n");
+               return;
+       }
+
+       __drm_atomic_helper_connector_reset(connector, &vcs->base);
+}
+
+
+/**
+ * vmw_du_connector_destroy_state - destroy connector state
+ * @connector: DRM connector
+ * @state: state object to destroy
+ *
+ * Destroys the connector state (both common and vmw-specific) for the
+ * specified plane.
+ */
+void
+vmw_du_connector_destroy_state(struct drm_connector *connector,
+                         struct drm_connector_state *state)
+{
+       drm_atomic_helper_connector_destroy_state(connector, state);
+}
 /*
  * Generic framebuffer code
  */
@@ -1771,6 +1846,70 @@ int vmw_du_connector_set_property(struct drm_connector *connector,
 
 
 
+/**
+ * vmw_du_connector_atomic_set_property - Atomic version of get property
+ *
+ * @crtc - crtc the property is associated with
+ *
+ * Returns:
+ * Zero on success, negative errno on failure.
+ */
+int
+vmw_du_connector_atomic_set_property(struct drm_connector *connector,
+                                    struct drm_connector_state *state,
+                                    struct drm_property *property,
+                                    uint64_t val)
+{
+       struct vmw_private *dev_priv = vmw_priv(connector->dev);
+       struct vmw_connector_state *vcs = vmw_connector_state_to_vcs(state);
+       struct vmw_display_unit *du = vmw_connector_to_du(connector);
+
+
+       if (property == dev_priv->implicit_placement_property) {
+               vcs->is_implicit = val;
+
+               /*
+                * We should really be doing a drm_atomic_commit() to
+                * commit the new state, but since this doesn't cause
+                * an immedate state change, this is probably ok
+                */
+               du->is_implicit = vcs->is_implicit;
+       } else {
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+
+/**
+ * vmw_du_connector_atomic_get_property - Atomic version of get property
+ *
+ * @connector - connector the property is associated with
+ *
+ * Returns:
+ * Zero on success, negative errno on failure.
+ */
+int
+vmw_du_connector_atomic_get_property(struct drm_connector *connector,
+                                    const struct drm_connector_state *state,
+                                    struct drm_property *property,
+                                    uint64_t *val)
+{
+       struct vmw_private *dev_priv = vmw_priv(connector->dev);
+       struct vmw_connector_state *vcs = vmw_connector_state_to_vcs(state);
+
+       if (property == dev_priv->implicit_placement_property)
+               *val = vcs->is_implicit;
+       else {
+               DRM_ERROR("Invalid Property %s\n", property->name);
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+
 int vmw_kms_update_layout_ioctl(struct drm_device *dev, void *data,
                                struct drm_file *file_priv)
 {

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
index 5602c2430719402aa7f2f08dad9ac5c4c8b5277c..cc50bf35aeca3403f0b34b6b584817f610eeb3fa 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
@@ -142,7 +142,8 @@ static const uint32_t vmw_cursor_plane_formats[] = {
 
 #define vmw_crtc_state_to_vcs(x) container_of(x, struct vmw_crtc_state, base)
 #define vmw_plane_state_to_vps(x) container_of(x, struct vmw_plane_state, base)
-
+#define vmw_connector_state_to_vcs(x) \
+               container_of(x, struct vmw_connector_state, base)
 
 /**
  * Derived class for crtc state object
@@ -172,6 +173,20 @@ struct vmw_plane_state {
        int pinned;
 };
 
+
+/**
+ * Derived class for connector state object
+ *
+ * @base DRM connector object
+ * @is_implicit connector property
+ *
+ */
+struct vmw_connector_state {
+       struct drm_connector_state base;
+
+       bool is_implicit;
+};
+
 /**
  * Base class display unit.
  *
@@ -241,6 +256,15 @@ int vmw_du_crtc_cursor_move(struct drm_crtc *crtc, int x, int y);
 int vmw_du_connector_set_property(struct drm_connector *connector,
                                  struct drm_property *property,
                                  uint64_t val);
+int vmw_du_connector_atomic_set_property(struct drm_connector *connector,
+                                        struct drm_connector_state *state,
+                                        struct drm_property *property,
+                                        uint64_t val);
+int
+vmw_du_connector_atomic_get_property(struct drm_connector *connector,
+                                    const struct drm_connector_state *state,
+                                    struct drm_property *property,
+                                    uint64_t *val);
 int vmw_du_connector_dpms(struct drm_connector *connector, int mode);
 void vmw_du_connector_save(struct drm_connector *connector);
 void vmw_du_connector_restore(struct drm_connector *connector);
@@ -326,6 +350,12 @@ void vmw_du_crtc_reset(struct drm_crtc *crtc);
 struct drm_crtc_state *vmw_du_crtc_duplicate_state(struct drm_crtc *crtc);
 void vmw_du_crtc_destroy_state(struct drm_crtc *crtc,
                                struct drm_crtc_state *state);
+void vmw_du_connector_reset(struct drm_connector *connector);
+struct drm_connector_state *
+vmw_du_connector_duplicate_state(struct drm_connector *connector);
+
+void vmw_du_connector_destroy_state(struct drm_connector *connector,
+                                   struct drm_connector_state *state);
 
 /*
  * Legacy display unit functions - vmwgfx_ldu.c

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
index 36cd1fe5fa335649f389e5cae741fe49879d2f52..276c7440b8b112a66d0c063625414bb56de13de1 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
@@ -27,6 +27,8 @@
 
 #include "vmwgfx_kms.h"
 #include <drm/drm_plane_helper.h>
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
 
 
 #define vmw_crtc_to_ldu(x) \
@@ -315,6 +317,11 @@ static const struct drm_connector_funcs vmw_legacy_connector_funcs = {
        .fill_modes = vmw_du_connector_fill_modes,
        .set_property = vmw_du_connector_set_property,
        .destroy = vmw_ldu_connector_destroy,
+       .reset = vmw_du_connector_reset,
+       .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
+       .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+       .atomic_set_property = vmw_du_connector_atomic_set_property,
+       .atomic_get_property = vmw_du_connector_atomic_get_property,
 };
 
 /*
@@ -408,6 +415,8 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
                goto err_free;
        }
        connector->status = vmw_du_connector_detect(connector, true);
+       vmw_connector_state_to_vcs(connector->state)->is_implicit = true;
+
 
        ret = drm_encoder_init(dev, encoder, &vmw_legacy_encoder_funcs,
                               DRM_MODE_ENCODER_VIRTUAL, NULL);
@@ -426,8 +435,8 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
                goto err_free_encoder;
        }
 
-       /* FIXME: Turn on after plane/connector states are implemented. */
-       /* vmw_du_crtc_reset(crtc); */
+
+       vmw_du_crtc_reset(crtc);
        ret = drm_crtc_init_with_planes(dev, crtc, &ldu->base.primary,
                                        &ldu->base.cursor,
                                        &vmw_legacy_crtc_funcs, NULL);

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
index cfba59a8e1551cdfafdc6780a15266b2d77dc5b4..36d42f5656b4233be0f079d4ee57f149875dedb5 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
@@ -27,6 +27,8 @@
 
 #include "vmwgfx_kms.h"
 #include <drm/drm_plane_helper.h>
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
 
 
 #define vmw_crtc_to_sou(x) \
@@ -496,6 +498,11 @@ static const struct drm_connector_funcs vmw_sou_connector_funcs = {
        .fill_modes = vmw_du_connector_fill_modes,
        .set_property = vmw_du_connector_set_property,
        .destroy = vmw_sou_connector_destroy,
+       .reset = vmw_du_connector_reset,
+       .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
+       .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+       .atomic_set_property = vmw_du_connector_atomic_set_property,
+       .atomic_get_property = vmw_du_connector_atomic_get_property,
 };
 
 /*
@@ -589,6 +596,8 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)
        }
 
        connector->status = vmw_du_connector_detect(connector, true);
+       vmw_connector_state_to_vcs(connector->state)->is_implicit = false;
+
 
        ret = drm_encoder_init(dev, encoder, &vmw_screen_object_encoder_funcs,
                               DRM_MODE_ENCODER_VIRTUAL, NULL);
@@ -607,8 +616,8 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)
                goto err_free_encoder;
        }
 
-       /* FIXME: Turn on after plane/connector states are implemented. */
-       /* vmw_du_crtc_reset(crtc); */
+
+       vmw_du_crtc_reset(crtc);
        ret = drm_crtc_init_with_planes(dev, crtc, &sou->base.primary,
                                        &sou->base.cursor,
                                        &vmw_screen_object_crtc_funcs, NULL);

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
index 2a0f550235c017ca7752edfefb26110a4adca1f3..b1fae4975247e2e29bcb929f4880898d2efbae39 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
@@ -28,6 +28,9 @@
 #include "vmwgfx_kms.h"
 #include "device_include/svga3d_surfacedefs.h"
 #include <drm/drm_plane_helper.h>
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+
 
 #define vmw_crtc_to_stdu(x) \
        container_of(x, struct vmw_screen_target_display_unit, base.crtc)
@@ -1078,6 +1081,11 @@ static const struct drm_connector_funcs vmw_stdu_connector_funcs = {
        .fill_modes = vmw_du_connector_fill_modes,
        .set_property = vmw_du_connector_set_property,
        .destroy = vmw_stdu_connector_destroy,
+       .reset = vmw_du_connector_reset,
+       .atomic_duplicate_state = vmw_du_connector_duplicate_state,
+       .atomic_destroy_state = vmw_du_connector_destroy_state,
+       .atomic_set_property = vmw_du_connector_atomic_set_property,
+       .atomic_get_property = vmw_du_connector_atomic_get_property,
 };
 
 
@@ -1174,6 +1182,8 @@ static int vmw_stdu_init(struct vmw_private *dev_priv, unsigned unit)
                goto err_free;
        }
 
+       vmw_du_connector_reset(connector);
+
        ret = drm_connector_init(dev, connector, &vmw_stdu_connector_funcs,
                                 DRM_MODE_CONNECTOR_VIRTUAL);
        if (ret) {
@@ -1181,6 +1191,7 @@ static int vmw_stdu_init(struct vmw_private *dev_priv, unsigned unit)
                goto err_free;
        }
        connector->status = vmw_du_connector_detect(connector, false);
+       vmw_connector_state_to_vcs(connector->state)->is_implicit = false;
 
        ret = drm_encoder_init(dev, encoder, &vmw_stdu_encoder_funcs,
                               DRM_MODE_ENCODER_VIRTUAL, NULL);
@@ -1199,8 +1210,7 @@ static int vmw_stdu_init(struct vmw_private *dev_priv, unsigned unit)
                goto err_free_encoder;
        }
 
-       /* FIXME: Turn on after plane/connector states are implemented. */
-       /* vmw_du_crtc_reset(crtc); */
+       vmw_du_crtc_reset(crtc);
        ret = drm_crtc_init_with_planes(dev, crtc, &stdu->base.primary,
                                        &stdu->base.cursor,
                                        &vmw_stdu_crtc_funcs, NULL);