diff options
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_display.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c index 90503222aa80..ad429683fef7 100644 --- a/drivers/gpu/drm/qxl/qxl_display.c +++ b/drivers/gpu/drm/qxl/qxl_display.c | |||
@@ -221,7 +221,6 @@ static int qxl_crtc_page_flip(struct drm_crtc *crtc, | |||
221 | { | 221 | { |
222 | struct drm_device *dev = crtc->dev; | 222 | struct drm_device *dev = crtc->dev; |
223 | struct qxl_device *qdev = dev->dev_private; | 223 | struct qxl_device *qdev = dev->dev_private; |
224 | struct qxl_crtc *qcrtc = to_qxl_crtc(crtc); | ||
225 | struct qxl_framebuffer *qfb_src = to_qxl_framebuffer(fb); | 224 | struct qxl_framebuffer *qfb_src = to_qxl_framebuffer(fb); |
226 | struct qxl_framebuffer *qfb_old = to_qxl_framebuffer(crtc->primary->fb); | 225 | struct qxl_framebuffer *qfb_old = to_qxl_framebuffer(crtc->primary->fb); |
227 | struct qxl_bo *bo_old = gem_to_qxl_bo(qfb_old->obj); | 226 | struct qxl_bo *bo_old = gem_to_qxl_bo(qfb_old->obj); |
@@ -252,14 +251,14 @@ static int qxl_crtc_page_flip(struct drm_crtc *crtc, | |||
252 | qxl_draw_dirty_fb(qdev, qfb_src, bo, 0, 0, | 251 | qxl_draw_dirty_fb(qdev, qfb_src, bo, 0, 0, |
253 | &norect, one_clip_rect, inc); | 252 | &norect, one_clip_rect, inc); |
254 | 253 | ||
255 | drm_vblank_get(dev, qcrtc->index); | 254 | drm_crtc_vblank_get(crtc); |
256 | 255 | ||
257 | if (event) { | 256 | if (event) { |
258 | spin_lock_irqsave(&dev->event_lock, flags); | 257 | spin_lock_irqsave(&dev->event_lock, flags); |
259 | drm_crtc_send_vblank_event(crtc, event); | 258 | drm_crtc_send_vblank_event(crtc, event); |
260 | spin_unlock_irqrestore(&dev->event_lock, flags); | 259 | spin_unlock_irqrestore(&dev->event_lock, flags); |
261 | } | 260 | } |
262 | drm_vblank_put(dev, qcrtc->index); | 261 | drm_crtc_vblank_put(crtc); |
263 | 262 | ||
264 | ret = qxl_bo_reserve(bo, false); | 263 | ret = qxl_bo_reserve(bo, false); |
265 | if (!ret) { | 264 | if (!ret) { |