drm/ast: Introduce struct ast_crtc_state

AST-specific CRTC state can be placed in the new struct ast_crtc_state.
The atomic check functions of the CRTC and the primary plane will store
the VBIOS mode info and the framebuffer format here. The CRTC will consume
these during atomic_flush().

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191202111557.15176-6-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
index 49557a73390f430045dc68fcb875bdf912f1e75b..e13afb8a706f41a6e15c45b237c7ea31981996c2 100644 (file)
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h
@@ -281,6 +281,12 @@ struct ast_vbios_mode_info {
        const struct ast_vbios_enhtable *enh_table;
 };
 
+struct ast_crtc_state {
+       struct drm_crtc_state base;
+};
+
+#define to_ast_crtc_state(state) container_of(state, struct ast_crtc_state, base)
+
 extern int ast_mode_init(struct drm_device *dev);
 extern void ast_mode_fini(struct drm_device *dev);
 

diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index 59c0c702857d0f16f16da1eb98eb740b80061771..ad2e0562ec55d95dd2a45cd34375940458ef4a77 100644 (file)
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -884,6 +884,31 @@ static void ast_crtc_destroy(struct drm_crtc *crtc)
        kfree(crtc);
 }
 
+static struct drm_crtc_state *
+ast_crtc_atomic_duplicate_state(struct drm_crtc *crtc)
+{
+       struct ast_crtc_state *new_ast_state;
+
+       if (WARN_ON(!crtc->state))
+               return NULL;
+
+       new_ast_state = kmalloc(sizeof(*new_ast_state), GFP_KERNEL);
+       if (!new_ast_state)
+               return NULL;
+       __drm_atomic_helper_crtc_duplicate_state(crtc, &new_ast_state->base);
+
+       return &new_ast_state->base;
+}
+
+static void ast_crtc_atomic_destroy_state(struct drm_crtc *crtc,
+                                         struct drm_crtc_state *state)
+{
+       struct ast_crtc_state *ast_state = to_ast_crtc_state(state);
+
+       __drm_atomic_helper_crtc_destroy_state(&ast_state->base);
+       kfree(ast_state);
+}
+
 static const struct drm_crtc_funcs ast_crtc_funcs = {
        .reset = drm_atomic_helper_crtc_reset,
        .set_config = drm_crtc_helper_set_config,
@@ -891,8 +916,8 @@ static const struct drm_crtc_funcs ast_crtc_funcs = {
        .destroy = ast_crtc_destroy,
        .set_config = drm_atomic_helper_set_config,
        .page_flip = drm_atomic_helper_page_flip,
-       .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
-       .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
+       .atomic_duplicate_state = ast_crtc_atomic_duplicate_state,
+       .atomic_destroy_state = ast_crtc_atomic_destroy_state,
 };
 
 static int ast_crtc_init(struct drm_device *dev)