Revert "gpu/drm: ingenic: Add option to mmap GEM buffers cached"

[linux-2.6-microblaze.git] / drivers / gpu / drm / ingenic / ingenic-ipu.c

diff --git a/drivers/gpu/drm/ingenic/ingenic-ipu.c b/drivers/gpu/drm/ingenic/ingenic-ipu.c
index 38c83e8..fc8c6e9 100644 (file)
--- a/drivers/gpu/drm/ingenic/ingenic-ipu.c
+++ b/drivers/gpu/drm/ingenic/ingenic-ipu.c
@@ -20,7 +20,6 @@
 
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
-#include <drm/drm_damage_helper.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_fourcc.h>
@@ -317,8 +316,6 @@ static void ingenic_ipu_plane_atomic_update(struct drm_plane *plane,
                                JZ_IPU_CTRL_CHIP_EN | JZ_IPU_CTRL_LCDC_SEL);
        }
 
-       ingenic_drm_sync_data(ipu->master, oldstate, state);
-
        /* New addresses will be committed in vblank handler... */
        ipu->addr_y = drm_fb_cma_get_gem_addr(state->fb, state, 0);
        if (finfo->num_planes > 1)
@@ -537,7 +534,7 @@ static int ingenic_ipu_plane_atomic_check(struct drm_plane *plane,
 
        if (!state->crtc ||
            !crtc_state->mode.hdisplay || !crtc_state->mode.vdisplay)
-               goto out_check_damage;
+               return 0;
 
        /* Plane must be fully visible */
        if (state->crtc_x < 0 || state->crtc_y < 0 ||
@@ -554,7 +551,7 @@ static int ingenic_ipu_plane_atomic_check(struct drm_plane *plane,
                return -EINVAL;
 
        if (!osd_changed(state, plane->state))
-               goto out_check_damage;
+               return 0;
 
        crtc_state->mode_changed = true;
 
@@ -581,9 +578,6 @@ static int ingenic_ipu_plane_atomic_check(struct drm_plane *plane,
        ipu->denom_w = denom_w;
        ipu->denom_h = denom_h;
 
-out_check_damage:
-       drm_atomic_helper_check_plane_damage(state->state, state);
-
        return 0;
 }
 
@@ -765,8 +759,6 @@ static int ingenic_ipu_bind(struct device *dev, struct device *master, void *d)
                return err;
        }
 
-       drm_plane_enable_fb_damage_clips(plane);
-
        /*
         * Sharpness settings range is [0,32]
         * 0       : nearest-neighbor