Merge branch 'drm-tda998x-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into...

[deliverable/linux.git] / drivers / gpu / drm / mediatek / mtk_drm_plane.c

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
index 51bc8988fc26f08b861397b4cd32c95d827ed49a..c461a232cbf5b0f5ebf589481f4391e7f27f24e0 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
@@ -30,57 +30,12 @@ static const u32 formats[] = {
        DRM_FORMAT_RGB565,
 };
 
-static void mtk_plane_enable(struct mtk_drm_plane *mtk_plane, bool enable,
-                            dma_addr_t addr, struct drm_rect *dest)
-{
-       struct drm_plane *plane = &mtk_plane->base;
-       struct mtk_plane_state *state = to_mtk_plane_state(plane->state);
-       unsigned int pitch, format;
-       int x, y;
-
-       if (WARN_ON(!plane->state || (enable && !plane->state->fb)))
-               return;
-
-       if (plane->state->fb) {
-               pitch = plane->state->fb->pitches[0];
-               format = plane->state->fb->pixel_format;
-       } else {
-               pitch = 0;
-               format = DRM_FORMAT_RGBA8888;
-       }
-
-       x = plane->state->crtc_x;
-       y = plane->state->crtc_y;
-
-       if (x < 0) {
-               addr -= x * 4;
-               x = 0;
-       }
-
-       if (y < 0) {
-               addr -= y * pitch;
-               y = 0;
-       }
-
-       state->pending.enable = enable;
-       state->pending.pitch = pitch;
-       state->pending.format = format;
-       state->pending.addr = addr;
-       state->pending.x = x;
-       state->pending.y = y;
-       state->pending.width = dest->x2 - dest->x1;
-       state->pending.height = dest->y2 - dest->y1;
-       wmb(); /* Make sure the above parameters are set before update */
-       state->pending.dirty = true;
-}
-
 static void mtk_plane_reset(struct drm_plane *plane)
 {
        struct mtk_plane_state *state;
 
        if (plane->state) {
-               if (plane->state->fb)
-                       drm_framebuffer_unreference(plane->state->fb);
+               __drm_atomic_helper_plane_destroy_state(plane->state);
 
                state = to_mtk_plane_state(plane->state);
                memset(state, 0, sizeof(*state));
@@ -134,20 +89,6 @@ static int mtk_plane_atomic_check(struct drm_plane *plane,
 {
        struct drm_framebuffer *fb = state->fb;
        struct drm_crtc_state *crtc_state;
-       bool visible;
-       struct drm_rect dest = {
-               .x1 = state->crtc_x,
-               .y1 = state->crtc_y,
-               .x2 = state->crtc_x + state->crtc_w,
-               .y2 = state->crtc_y + state->crtc_h,
-       };
-       struct drm_rect src = {
-               /* 16.16 fixed point */
-               .x1 = state->src_x,
-               .y1 = state->src_y,
-               .x2 = state->src_x + state->src_w,
-               .y2 = state->src_y + state->src_h,
-       };
        struct drm_rect clip = { 0, };
 
        if (!fb)
@@ -168,39 +109,45 @@ static int mtk_plane_atomic_check(struct drm_plane *plane,
        clip.x2 = crtc_state->mode.hdisplay;
        clip.y2 = crtc_state->mode.vdisplay;
 
-       return drm_plane_helper_check_update(plane, state->crtc, fb,
-                                            &src, &dest, &clip,
-                                            DRM_PLANE_HELPER_NO_SCALING,
-                                            DRM_PLANE_HELPER_NO_SCALING,
-                                            true, true, &visible);
+       return drm_plane_helper_check_state(state, &clip,
+                                           DRM_PLANE_HELPER_NO_SCALING,
+                                           DRM_PLANE_HELPER_NO_SCALING,
+                                           true, true);
 }
 
 static void mtk_plane_atomic_update(struct drm_plane *plane,
                                    struct drm_plane_state *old_state)
 {
        struct mtk_plane_state *state = to_mtk_plane_state(plane->state);
-       struct drm_crtc *crtc = state->base.crtc;
+       struct drm_crtc *crtc = plane->state->crtc;
+       struct drm_framebuffer *fb = plane->state->fb;
        struct drm_gem_object *gem;
        struct mtk_drm_gem_obj *mtk_gem;
-       struct mtk_drm_plane *mtk_plane = to_mtk_plane(plane);
-       struct drm_rect dest = {
-               .x1 = state->base.crtc_x,
-               .y1 = state->base.crtc_y,
-               .x2 = state->base.crtc_x + state->base.crtc_w,
-               .y2 = state->base.crtc_y + state->base.crtc_h,
-       };
-       struct drm_rect clip = { 0, };
+       unsigned int pitch, format;
+       dma_addr_t addr;
 
-       if (!crtc)
+       if (!crtc || WARN_ON(!fb))
                return;
 
-       clip.x2 = state->base.crtc->state->mode.hdisplay;
-       clip.y2 = state->base.crtc->state->mode.vdisplay;
-       drm_rect_intersect(&dest, &clip);
-
-       gem = mtk_fb_get_gem_obj(state->base.fb);
+       gem = mtk_fb_get_gem_obj(fb);
        mtk_gem = to_mtk_gem_obj(gem);
-       mtk_plane_enable(mtk_plane, true, mtk_gem->dma_addr, &dest);
+       addr = mtk_gem->dma_addr;
+       pitch = fb->pitches[0];
+       format = fb->pixel_format;
+
+       addr += (plane->state->src.x1 >> 16) * drm_format_plane_cpp(format, 0);
+       addr += (plane->state->src.y1 >> 16) * pitch;
+
+       state->pending.enable = true;
+       state->pending.pitch = pitch;
+       state->pending.format = format;
+       state->pending.addr = addr;
+       state->pending.x = plane->state->dst.x1;
+       state->pending.y = plane->state->dst.y1;
+       state->pending.width = drm_rect_width(&plane->state->dst);
+       state->pending.height = drm_rect_height(&plane->state->dst);
+       wmb(); /* Make sure the above parameters are set before update */
+       state->pending.dirty = true;
 }
 
 static void mtk_plane_atomic_disable(struct drm_plane *plane,
@@ -219,13 +166,12 @@ static const struct drm_plane_helper_funcs mtk_plane_helper_funcs = {
        .atomic_disable = mtk_plane_atomic_disable,
 };
 
-int mtk_plane_init(struct drm_device *dev, struct mtk_drm_plane *mtk_plane,
-                  unsigned long possible_crtcs, enum drm_plane_type type,
-                  unsigned int zpos)
+int mtk_plane_init(struct drm_device *dev, struct drm_plane *plane,
+                  unsigned long possible_crtcs, enum drm_plane_type type)
 {
        int err;
 
-       err = drm_universal_plane_init(dev, &mtk_plane->base, possible_crtcs,
+       err = drm_universal_plane_init(dev, plane, possible_crtcs,
                                       &mtk_plane_funcs, formats,
                                       ARRAY_SIZE(formats), type, NULL);
        if (err) {
@@ -233,8 +179,7 @@ int mtk_plane_init(struct drm_device *dev, struct mtk_drm_plane *mtk_plane,
                return err;
        }
 
-       drm_plane_helper_add(&mtk_plane->base, &mtk_plane_helper_funcs);
-       mtk_plane->idx = zpos;
+       drm_plane_helper_add(plane, &mtk_plane_helper_funcs);
 
        return 0;
 }