drm: Consolidate crtc arrays in drm_atomic_state

It's silly to have 2 mallocs when we could tie these two together.

Also, Gustavo adds another one in his per-crtc out-fence patches. And
I want to add more stuff here for nonblocking commit helpers.

In the future we can use this to store a pointer to the preceeding
state, making an atomic update entirely free-standing. This will be
needed to be able to queue them up with a depth > 1.

Cc: Gustavo Padovan <gustavo@padovan.org>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1464818821-5736-12-git-send-email-daniel.vetter@ffwll.ch

4 files changed, 18 insertions, 19 deletions

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 68fd99d2fd01..674b2e490aa9 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -45,7 +45,6 @@ void drm_atomic_state_default_release(struct drm_atomic_state *state)
 {
         kfree(state->connectors);
         kfree(state->crtcs);
-        kfree(state->crtc_states);
         kfree(state->planes);
 }
 EXPORT_SYMBOL(drm_atomic_state_default_release);
@@ -70,10 +69,6 @@ drm_atomic_state_init(struct drm_device *dev, struct drm_atomic_state *state)
                                sizeof(*state->crtcs), GFP_KERNEL);
         if (!state->crtcs)
                 goto fail;
-        state->crtc_states = kcalloc(dev->mode_config.num_crtc,
-                                     sizeof(*state->crtc_states), GFP_KERNEL);
-        if (!state->crtc_states)
-                goto fail;
         state->planes = kcalloc(dev->mode_config.num_total_plane,
                                 sizeof(*state->planes), GFP_KERNEL);
         if (!state->planes)
@@ -146,15 +141,15 @@ void drm_atomic_state_default_clear(struct drm_atomic_state *state)
         }
 
         for (i = 0; i < config->num_crtc; i++) {
-                struct drm_crtc *crtc = state->crtcs[i];
+                struct drm_crtc *crtc = state->crtcs[i].ptr;
 
                 if (!crtc)
                         continue;
 
                 crtc->funcs->atomic_destroy_state(crtc,
-                                                  state->crtc_states[i]);
-                state->crtcs[i] = NULL;
-                state->crtc_states[i] = NULL;
+                                                  state->crtcs[i].state);
+                state->crtcs[i].ptr = NULL;
+                state->crtcs[i].state = NULL;
         }
 
         for (i = 0; i < config->num_total_plane; i++) {
@@ -264,8 +259,8 @@ drm_atomic_get_crtc_state(struct drm_atomic_state *state,
         if (!crtc_state)
                 return ERR_PTR(-ENOMEM);
 
-        state->crtc_states[index] = crtc_state;
-        state->crtcs[index] = crtc;
+        state->crtcs[index].state = crtc_state;
+        state->crtcs[index].ptr = crtc;
         crtc_state->state = state;
 
         DRM_DEBUG_ATOMIC("Added [CRTC:%d:%s] %p state to %p\n",
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index c2ef42c8a947..94509453b3f9 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -1578,7 +1578,7 @@ void drm_atomic_helper_swap_state(struct drm_device *dev,
 
         for_each_crtc_in_state(state, crtc, crtc_state, i) {
                 crtc->state->state = state;
-                swap(state->crtc_states[i], crtc->state);
+                swap(state->crtcs[i].state, crtc->state);
                 crtc->state->state = NULL;
         }
 
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index 8e616d39353b..d9504dfcd1cc 100644
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@ -71,7 +71,7 @@ static inline struct drm_crtc_state *
 drm_atomic_get_existing_crtc_state(struct drm_atomic_state *state,
                                    struct drm_crtc *crtc)
 {
-        return state->crtc_states[drm_crtc_index(crtc)];
+        return state->crtcs[drm_crtc_index(crtc)].state;
 }
 
 /**
@@ -183,11 +183,11 @@ int __must_check drm_atomic_nonblocking_commit(struct drm_atomic_state *state);
              (__i)++)                                                   \
                 for_each_if (connector)
 
-#define for_each_crtc_in_state(state, crtc, crtc_state, __i)    \
+#define for_each_crtc_in_state(__state, crtc, crtc_state, __i)  \
         for ((__i) = 0;                                         \
-             (__i) < (state)->dev->mode_config.num_crtc &&      \
-             ((crtc) = (state)->crtcs[__i],                     \
-             (crtc_state) = (state)->crtc_states[__i], 1);      \
+             (__i) < (__state)->dev->mode_config.num_crtc &&    \
+             ((crtc) = (__state)->crtcs[__i].ptr,                       \
+             (crtc_state) = (__state)->crtcs[__i].state, 1);    \
              (__i)++)                                           \
                 for_each_if (crtc_state)
 
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 821398ce52d0..07a410144b07 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -1698,6 +1698,11 @@ struct __drm_planes_state {
         struct drm_plane_state *state;
 };
 
+struct __drm_crtcs_state {
+        struct drm_crtc *ptr;
+        struct drm_crtc_state *state;
+};
+
 struct __drm_connnectors_state {
         struct drm_connector *ptr;
         struct drm_connector_state *state;
@@ -1722,8 +1727,7 @@ struct drm_atomic_state {
         bool legacy_cursor_update : 1;
         bool legacy_set_config : 1;
         struct __drm_planes_state *planes;
-        struct drm_crtc **crtcs;
-        struct drm_crtc_state **crtc_states;
+        struct __drm_crtcs_state *crtcs;
         int num_connector;
         struct __drm_connnectors_state *connectors;