drm/armada: clean up armada_drm_crtc_page_flip()

drm_mode_page_flip_ioctl() already takes care of checking the
framebuffer format, and also assigns primary->fb after a successful
call to this handler.  These are both redundant, and can be removed.

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 42a40daff13265c968f442b4dafd2ec081bbafd7..78bb3d51417ba773927907929cb9f5a49a9112a9 100644 (file)
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -1039,10 +1039,6 @@ static int armada_drm_crtc_page_flip(struct drm_crtc *crtc,
        unsigned i;
        int ret;
 
-       /* We don't support changing the pixel format */
-       if (fb->format != crtc->primary->fb->format)
-               return -EINVAL;
-
        work = armada_drm_crtc_alloc_plane_work(dcrtc->crtc.primary);
        if (!work)
                return -ENOMEM;
@@ -1068,14 +1064,6 @@ static int armada_drm_crtc_page_flip(struct drm_crtc *crtc,
                return ret;
        }
 
-       /*
-        * Don't take a reference on the new framebuffer;
-        * drm_mode_page_flip_ioctl() has already grabbed a reference and
-        * will _not_ drop that reference on successful return from this
-        * function.  Simply mark this new framebuffer as the current one.
-        */
-       dcrtc->crtc.primary->fb = fb;
-
        /*
         * Finally, if the display is blanked, we won't receive an
         * interrupt, so complete it now.