From patchwork Mon Jun 6 14:41:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9158421 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F0C6160759 for ; Mon, 6 Jun 2016 14:42:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF55C20265 for ; Mon, 6 Jun 2016 14:42:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D43BC2821F; Mon, 6 Jun 2016 14:42:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7F9B20265 for ; Mon, 6 Jun 2016 14:42:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3B1B26E593; Mon, 6 Jun 2016 14:42:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yw0-f195.google.com (mail-yw0-f195.google.com [209.85.161.195]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9C3786E5A3 for ; Mon, 6 Jun 2016 14:42:34 +0000 (UTC) Received: by mail-yw0-f195.google.com with SMTP id y6so19322456ywe.0 for ; Mon, 06 Jun 2016 07:42:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jRP3DCvEWSONv/0Y0BJY2mI+g0S3x8DVqgwGfrdOgqA=; b=Ja38lJCa9sDnMjF3DM8lJc6S+9PXlfxHUVYJ6/0rZgyM6jFChxJbFV0o7B83N1g+Sn PcAt9H+VmluYJI2ectGGIoz3YCwWxAjgRl6onIuJyxEeHgvGms2I64Jv6Npe/5iDWkPP crHm2VyH+duWyHaTCT9iTNHDw2ZMsn1Dq7GuOL9MtaVIBYNkSMPg+AQlC0GmB+J+kC5i IJe+KAciMqmH93QFWdFx7GbuTsPXeR+NbSbALNMKUPC8KDiMxJYYLo8uVd1zs9maXtnB xGM8z/HX0J0QMkWHzTaPdD9Lu85b1XAa6nRko+BGsgdFtmnzjD0796ZMmh/THzSKSPEt iJzQ== X-Gm-Message-State: ALyK8tItKnEN9GoXtWRMctUisEatBc98DqYtJOqSMWFg1lbqAbKN08fD36VkD1lEDCFc5A== X-Received: by 10.37.216.212 with SMTP id p203mr1507576ybg.154.1465224153509; Mon, 06 Jun 2016 07:42:33 -0700 (PDT) Received: from jade.localdomain ([201.82.24.203]) by smtp.gmail.com with ESMTPSA id f124sm11736407ywb.13.2016.06.06.07.42.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jun 2016 07:42:32 -0700 (PDT) From: Gustavo Padovan To: dri-devel@lists.freedesktop.org Subject: [PATCH 12/14] drm/qxl: use drm_crtc_vblank_{get,put}() Date: Mon, 6 Jun 2016 11:41:43 -0300 Message-Id: <1465224105-21485-12-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1465224105-21485-1-git-send-email-gustavo@padovan.org> References: <1465224105-21485-1-git-send-email-gustavo@padovan.org> Cc: Daniel Vetter , open list , Jonathon Jongsma , Dave Airlie , Gustavo Padovan X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Gustavo Padovan Replace the legacy drm_vblank_{get,put}() with the new helper functions. Signed-off-by: Gustavo Padovan --- drivers/gpu/drm/qxl/qxl_display.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c index 4c8cac98..d1e465a 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, { struct drm_device *dev = crtc->dev; struct qxl_device *qdev = dev->dev_private; - struct qxl_crtc *qcrtc = to_qxl_crtc(crtc); struct qxl_framebuffer *qfb_src = to_qxl_framebuffer(fb); struct qxl_framebuffer *qfb_old = to_qxl_framebuffer(crtc->primary->fb); 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, qxl_draw_dirty_fb(qdev, qfb_src, bo, 0, 0, &norect, one_clip_rect, inc); - drm_vblank_get(dev, qcrtc->index); + drm_crtc_vblank_get(crtc); if (event) { spin_lock_irqsave(&dev->event_lock, flags); drm_crtc_send_vblank_event(crtc, event); spin_unlock_irqrestore(&dev->event_lock, flags); } - drm_vblank_put(dev, qcrtc->index); + drm_crtc_vblank_put(crtc); ret = qxl_bo_reserve(bo, false); if (!ret) {