summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2014-09-03 19:25:50 +0000
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-03-24 13:33:24 +0200
commit549a75498151370214f86eacc788a5832ac01e59 (patch)
tree7958a6a101ddc9ff15e65d7cc8f7be4a7cfb54cd /drivers/gpu/drm/omapdrm
parent173372975457ca0fa0acddf60d087976bacb6ab3 (diff)
downloadlinux-549a75498151370214f86eacc788a5832ac01e59.tar.bz2
drm/omap: page_flip: return -EBUSY if flip pending
The DRM documentation says: "If a page flip is already pending, the page_flip operation must return -EBUSY." Currently omapdrm returns -EINVAL instead. Fix omapdrm by returning -EBUSY. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_crtc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index 5cd10cf57985..a4d6f5ec627e 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -606,7 +606,7 @@ static int omap_crtc_page_flip_locked(struct drm_crtc *crtc,
if (omap_crtc->old_fb) {
spin_unlock_irqrestore(&dev->event_lock, flags);
dev_err(dev->dev, "already a pending flip\n");
- return -EINVAL;
+ return -EBUSY;
}
omap_crtc->event = event;