diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2018-07-30 13:52:34 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2018-07-30 13:52:34 +0300 |
| commit | c36045e17a0e9206078a3254385bf9258e32d5b8 (patch) | |
| tree | c600cb6e8c2268befe352cae19c2b2599cfc14d0 /drivers/gpu/drm/armada/armada_crtc.h | |
| parent | 80c63aee8143d83743a9df6d09309d3d15b20680 (diff) | |
| download | linux-c36045e17a0e9206078a3254385bf9258e32d5b8.tar.xz | |
drm/armada: convert primary plane to atomic state
Convert the primary plane as a whole to use its atomic state and the
transitional helpers. The CRTC is also switched to use the transitional
helpers for mode_set() and mode_set_base().
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'drivers/gpu/drm/armada/armada_crtc.h')
| -rw-r--r-- | drivers/gpu/drm/armada/armada_crtc.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/armada/armada_crtc.h b/drivers/gpu/drm/armada/armada_crtc.h index 8edcfd1fa75f..3253947e0d41 100644 --- a/drivers/gpu/drm/armada/armada_crtc.h +++ b/drivers/gpu/drm/armada/armada_crtc.h @@ -93,7 +93,6 @@ struct armada_crtc { uint8_t csc_rgb_mode; struct drm_plane *plane; - struct drm_framebuffer *old_modeset_fb; struct armada_gem_object *cursor_obj; int cursor_x; @@ -110,14 +109,15 @@ struct armada_crtc { spinlock_t irq_lock; uint32_t irq_ena; + + struct armada_regs atomic_regs[32]; + struct armada_regs *regs; + unsigned int regs_idx; }; #define drm_to_armada_crtc(c) container_of(c, struct armada_crtc, crtc) void armada_drm_crtc_update_regs(struct armada_crtc *, struct armada_regs *); -int armada_drm_plane_disable(struct drm_plane *plane, - struct drm_modeset_acquire_ctx *ctx); - extern struct platform_driver armada_lcd_platform_driver; #endif |