Commit 1729f560 authored by Russell King's avatar Russell King

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: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent 7794ec77
......@@ -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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment