Merge tag 'mac80211-for-davem-2016-07-06' of git://git.kernel.org/pub/scm/linux/kerne...

[cascardo/linux.git] / drivers / gpu / drm / msm / mdp / mdp5 / mdp5_crtc.c

diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
index 9673b95..88fe256 100644 (file)
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
@@ -149,7 +149,7 @@ static void complete_flip(struct drm_crtc *crtc, struct drm_file *file)
                if (!file || (event->base.file_priv == file)) {
                        mdp5_crtc->event = NULL;
                        DBG("%s: send event: %p", mdp5_crtc->name, event);
-                       drm_send_vblank_event(dev, mdp5_crtc->id, event);
+                       drm_crtc_send_vblank_event(crtc, event);
                }
        }
        spin_unlock_irqrestore(&dev->event_lock, flags);
@@ -518,7 +518,7 @@ static int mdp5_crtc_cursor_set(struct drm_crtc *crtc,
                goto set_cursor;
        }
 
-       cursor_bo = drm_gem_object_lookup(dev, file, handle);
+       cursor_bo = drm_gem_object_lookup(file, handle);
        if (!cursor_bo)
                return -ENOENT;