drm/armada: move regs into armada_plane_work

Move the register update structure out of the overlay private structure
into armada_plane_work, as this is common to both the primary and
overlay planes.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index b043766c416c92816e1df9d443039cf830cbe654..02eefdc6f062ccb033dcbbec32eac65eafa3f171 100644 (file)
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -20,11 +20,6 @@
 #include "armada_hw.h"
 #include "armada_trace.h"
 
-struct armada_frame_work {
-       struct armada_plane_work work;
-       struct armada_regs regs[4];
-};
-
 enum csc_mode {
        CSC_AUTO = 0,
        CSC_YUV_CCIR601 = 1,
@@ -288,37 +283,34 @@ void armada_drm_plane_work_cancel(struct armada_crtc *dcrtc,
 static void armada_drm_crtc_finish_frame_work(struct armada_crtc *dcrtc,
        struct armada_plane_work *work)
 {
-       struct armada_frame_work *fwork = container_of(work, struct armada_frame_work, work);
-
-       kfree(fwork);
+       kfree(work);
 }
 
 static void armada_drm_crtc_complete_frame_work(struct armada_crtc *dcrtc,
        struct armada_plane_work *work)
 {
-       struct armada_frame_work *fwork = container_of(work, struct armada_frame_work, work);
        unsigned long flags;
 
        spin_lock_irqsave(&dcrtc->irq_lock, flags);
-       armada_drm_crtc_update_regs(dcrtc, fwork->regs);
+       armada_drm_crtc_update_regs(dcrtc, work->regs);
        spin_unlock_irqrestore(&dcrtc->irq_lock, flags);
 
        armada_drm_crtc_finish_frame_work(dcrtc, work);
 }
 
-static struct armada_frame_work *
-armada_drm_crtc_alloc_frame_work(struct drm_plane *plane)
+static struct armada_plane_work *
+armada_drm_crtc_alloc_plane_work(struct drm_plane *plane)
 {
-       struct armada_frame_work *work;
+       struct armada_plane_work *work;
        int i = 0;
 
        work = kzalloc(sizeof(*work), GFP_KERNEL);
        if (!work)
                return NULL;
 
-       work->work.plane = plane;
-       work->work.fn = armada_drm_crtc_complete_frame_work;
-       work->work.cancel = armada_drm_crtc_finish_frame_work;
+       work->plane = plane;
+       work->fn = armada_drm_crtc_complete_frame_work;
+       work->cancel = armada_drm_crtc_finish_frame_work;
        armada_reg_queue_end(work->regs, i);
 
        return work;
@@ -327,7 +319,7 @@ armada_drm_crtc_alloc_frame_work(struct drm_plane *plane)
 static void armada_drm_crtc_finish_fb(struct armada_crtc *dcrtc,
        struct drm_framebuffer *fb, bool force)
 {
-       struct armada_frame_work *work;
+       struct armada_plane_work *work;
 
        if (!fb)
                return;
@@ -338,11 +330,11 @@ static void armada_drm_crtc_finish_fb(struct armada_crtc *dcrtc,
                return;
        }
 
-       work = armada_drm_crtc_alloc_frame_work(dcrtc->crtc.primary);
+       work = armada_drm_crtc_alloc_plane_work(dcrtc->crtc.primary);
        if (work) {
-               work->work.old_fb = fb;
+               work->old_fb = fb;
 
-               if (armada_drm_plane_work_queue(dcrtc, &work->work) == 0)
+               if (armada_drm_plane_work_queue(dcrtc, work) == 0)
                        return;
 
                kfree(work);
@@ -1019,7 +1011,7 @@ static int armada_drm_crtc_page_flip(struct drm_crtc *crtc,
        struct drm_modeset_acquire_ctx *ctx)
 {
        struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
-       struct armada_frame_work *work;
+       struct armada_plane_work *work;
        unsigned i;
        int ret;
 
@@ -1027,12 +1019,12 @@ static int armada_drm_crtc_page_flip(struct drm_crtc *crtc,
        if (fb->format != crtc->primary->fb->format)
                return -EINVAL;
 
-       work = armada_drm_crtc_alloc_frame_work(dcrtc->crtc.primary);
+       work = armada_drm_crtc_alloc_plane_work(dcrtc->crtc.primary);
        if (!work)
                return -ENOMEM;
 
-       work->work.event = event;
-       work->work.old_fb = dcrtc->crtc.primary->fb;
+       work->event = event;
+       work->old_fb = dcrtc->crtc.primary->fb;
 
        i = armada_drm_crtc_calc_fb(fb, crtc->x, crtc->y, work->regs,
                                    dcrtc->interlaced);
@@ -1044,7 +1036,7 @@ static int armada_drm_crtc_page_flip(struct drm_crtc *crtc,
         */
        drm_framebuffer_get(fb);
 
-       ret = armada_drm_plane_work_queue(dcrtc, &work->work);
+       ret = armada_drm_plane_work_queue(dcrtc, work);
        if (ret) {
                /* Undo our reference above */
                drm_framebuffer_put(fb);

diff --git a/drivers/gpu/drm/armada/armada_crtc.h b/drivers/gpu/drm/armada/armada_crtc.h
index 4cdd2f0eabd9673e42e91a480fa21321907de201..12ef9688a45ace7bfb11a063b2e6c4fb2bc9aaf2 100644 (file)
--- a/drivers/gpu/drm/armada/armada_crtc.h
+++ b/drivers/gpu/drm/armada/armada_crtc.h
@@ -41,6 +41,7 @@ struct armada_plane_work {
        struct drm_plane *plane;
        struct drm_framebuffer *old_fb;
        struct drm_pending_vblank_event *event;
+       struct armada_regs regs[14];
 };
 
 struct armada_plane_state {

diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c
index 01087c952916f67761f1d6b41401f5c7ff4b73c6..200223861bfb79edf23ff2cdda73e18f2c29a520 100644 (file)
--- a/drivers/gpu/drm/armada/armada_overlay.c
+++ b/drivers/gpu/drm/armada/armada_overlay.c
@@ -32,10 +32,7 @@ struct armada_ovl_plane_properties {
 
 struct armada_ovl_plane {
        struct armada_plane base;
-       struct {
-               struct armada_plane_work work;
-               struct armada_regs regs[13];
-       } vbl;
+       struct armada_plane_work work;
        struct armada_ovl_plane_properties prop;
 };
 #define drm_to_armada_ovl_plane(p) \
@@ -70,14 +67,12 @@ armada_ovl_update_attr(struct armada_ovl_plane_properties *prop,
 static void armada_ovl_plane_work(struct armada_crtc *dcrtc,
        struct armada_plane_work *work)
 {
-       struct armada_ovl_plane *dplane = container_of(work->plane,
-                                       struct armada_ovl_plane, base.base);
        unsigned long flags;
 
        trace_armada_ovl_plane_work(&dcrtc->crtc, work->plane);
 
        spin_lock_irqsave(&dcrtc->irq_lock, flags);
-       armada_drm_crtc_update_regs(dcrtc, dplane->vbl.regs);
+       armada_drm_crtc_update_regs(dcrtc, work->regs);
        spin_unlock_irqrestore(&dcrtc->irq_lock, flags);
 }
 
@@ -90,6 +85,7 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
 {
        struct armada_ovl_plane *dplane = drm_to_armada_ovl_plane(plane);
        struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
+       struct armada_plane_work *work = &dplane->work;
        const struct drm_format_info *format;
        struct drm_rect src = {
                .x1 = src_x,
@@ -182,60 +178,60 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
                 */
                drm_framebuffer_get(fb);
 
-               dplane->vbl.work.old_fb = plane->fb;
+               work->old_fb = plane->fb;
 
                dplane->base.state.src_y = src_y = src.y1 >> 16;
                dplane->base.state.src_x = src_x = src.x1 >> 16;
 
                armada_drm_plane_calc_addrs(addrs, fb, src_x, src_y);
 
-               armada_reg_queue_set(dplane->vbl.regs, idx, addrs[0],
+               armada_reg_queue_set(work->regs, idx, addrs[0],
                                     LCD_SPU_DMA_START_ADDR_Y0);
-               armada_reg_queue_set(dplane->vbl.regs, idx, addrs[1],
+               armada_reg_queue_set(work->regs, idx, addrs[1],
                                     LCD_SPU_DMA_START_ADDR_U0);
-               armada_reg_queue_set(dplane->vbl.regs, idx, addrs[2],
+               armada_reg_queue_set(work->regs, idx, addrs[2],
                                     LCD_SPU_DMA_START_ADDR_V0);
-               armada_reg_queue_set(dplane->vbl.regs, idx, addrs[0],
+               armada_reg_queue_set(work->regs, idx, addrs[0],
                                     LCD_SPU_DMA_START_ADDR_Y1);
-               armada_reg_queue_set(dplane->vbl.regs, idx, addrs[1],
+               armada_reg_queue_set(work->regs, idx, addrs[1],
                                     LCD_SPU_DMA_START_ADDR_U1);
-               armada_reg_queue_set(dplane->vbl.regs, idx, addrs[2],
+               armada_reg_queue_set(work->regs, idx, addrs[2],
                                     LCD_SPU_DMA_START_ADDR_V1);
 
                val = fb->pitches[0] << 16 | fb->pitches[0];
-               armada_reg_queue_set(dplane->vbl.regs, idx, val,
+               armada_reg_queue_set(work->regs, idx, val,
                                     LCD_SPU_DMA_PITCH_YC);
                val = fb->pitches[1] << 16 | fb->pitches[2];
-               armada_reg_queue_set(dplane->vbl.regs, idx, val,
+               armada_reg_queue_set(work->regs, idx, val,
                                     LCD_SPU_DMA_PITCH_UV);
        } else {
-               dplane->vbl.work.old_fb = NULL;
+               work->old_fb = NULL;
        }
 
        val = (drm_rect_height(&src) & 0xffff0000) | drm_rect_width(&src) >> 16;
        if (dplane->base.state.src_hw != val) {
                dplane->base.state.src_hw = val;
-               armada_reg_queue_set(dplane->vbl.regs, idx, val,
+               armada_reg_queue_set(work->regs, idx, val,
                                     LCD_SPU_DMA_HPXL_VLN);
        }
 
        val = drm_rect_height(&dest) << 16 | drm_rect_width(&dest);
        if (dplane->base.state.dst_hw != val) {
                dplane->base.state.dst_hw = val;
-               armada_reg_queue_set(dplane->vbl.regs, idx, val,
+               armada_reg_queue_set(work->regs, idx, val,
                                     LCD_SPU_DZM_HPXL_VLN);
        }
 
        val = dest.y1 << 16 | dest.x1;
        if (dplane->base.state.dst_yx != val) {
                dplane->base.state.dst_yx = val;
-               armada_reg_queue_set(dplane->vbl.regs, idx, val,
+               armada_reg_queue_set(work->regs, idx, val,
                                     LCD_SPU_DMA_OVSA_HPXL_VLN);
        }
 
        if (dplane->base.state.ctrl0 != ctrl0) {
                dplane->base.state.ctrl0 = ctrl0;
-               armada_reg_queue_mod(dplane->vbl.regs, idx, ctrl0,
+               armada_reg_queue_mod(work->regs, idx, ctrl0,
                        CFG_CBSH_ENA | CFG_DMAFORMAT | CFG_DMA_FTOGGLE |
                        CFG_DMA_HSMOOTH | CFG_DMA_TSTMODE |
                        CFG_DMA_MOD(CFG_SWAPRB | CFG_SWAPUV | CFG_SWAPYU |
@@ -243,9 +239,9 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
                        LCD_SPU_DMA_CTRL0);
        }
        if (idx) {
-               armada_reg_queue_end(dplane->vbl.regs, idx);
+               armada_reg_queue_end(work->regs, idx);
                /* Queue it for update on the next interrupt if we are enabled */
-               armada_drm_plane_work_queue(dcrtc, &dplane->vbl.work);
+               armada_drm_plane_work_queue(dcrtc, work);
        }
        return 0;
 }
@@ -432,8 +428,8 @@ int armada_overlay_plane_create(struct drm_device *dev, unsigned long crtcs)
                return ret;
        }
 
-       dplane->vbl.work.plane = &dplane->base.base;
-       dplane->vbl.work.fn = armada_ovl_plane_work;
+       dplane->work.plane = &dplane->base.base;
+       dplane->work.fn = armada_ovl_plane_work;
 
        ret = drm_universal_plane_init(dev, &dplane->base.base, crtcs,
                                       &armada_ovl_plane_funcs,