From patchwork Mon Nov 14 09:02:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9426891 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 451DC6047D for ; Mon, 14 Nov 2016 09:03:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F211286DE for ; Mon, 14 Nov 2016 09:03:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2415E28777; Mon, 14 Nov 2016 09:03:16 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 785E228729 for ; Mon, 14 Nov 2016 09:03:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7E72A6E361; Mon, 14 Nov 2016 09:03:10 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 46E9A6E361 for ; Mon, 14 Nov 2016 09:03:08 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id a20so13383490wme.2 for ; Mon, 14 Nov 2016 01:03:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=z3pUbnurCR+TBDYTdWmKsAi5VRYU9uNPAZ+LKlV3qMc=; b=eoN8RqSkdaZwmSpZG202FNbchWu3y2Inh35eaIFN5aY55WX4GJCNHQs88tS5TRnvNN Mqh8Rv48PnwwVx0NGvRmY9gZzPyqXpchbggWLUNoSHZE5wvx8fXkKr8g1ucGwO3VwQSx GZWfCduwjV7/tUbMleRsEsD9owmwcicKMsTyU= 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=z3pUbnurCR+TBDYTdWmKsAi5VRYU9uNPAZ+LKlV3qMc=; b=ZVerWn+hsf28SKXxLn231/IdPurByG8ZBTdy4DdL4sEKk6i6B/UoiFbK1P6KFyIA1H XllcDpQ4I76GEpk0LPfy/DTVsNgXoSm8SKUpuCHlNVlqWLM/oOPseVTB/Ba89jbDYIMU 2ePqHUQ/PHcWpn3OPiLFPWGnxI5Qtx3+PrcxE6xgff45A06zDFBh1EmMMJlKZdHtP6hE cOv/yI+cvpDMAJ1V9VVy/dTTUC1W1Oq1Tq8hRjPGqek/xAh80fAvu7VMgTAPLKfK4fmN /DeZwnFEdxdz4bOjH06y4t4GGsoQ6JwOawlCEzr20AHJR2yCdI0JPNOnyqS0ac8YJLgH IZEw== X-Gm-Message-State: ABUngvd5k8tIFqI21yK1Z/2yzZ1rIVyYn8jBtkiDz/2QgWtpgu0H92/qnzDlPUsm7T073w== X-Received: by 10.28.54.161 with SMTP id y33mr8877209wmh.122.1479114186790; Mon, 14 Nov 2016 01:03:06 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id hy10sm27393012wjb.10.2016.11.14.01.03.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Nov 2016 01:03:06 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 4/6] drm/irq: Unexport drm_vblank_count Date: Mon, 14 Nov 2016 10:02:53 +0100 Message-Id: <20161114090255.31595-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161114090255.31595-1-daniel.vetter@ffwll.ch> References: <20161114090255.31595-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Vetter 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 No one outside of drm_irq.c should ever need this. The correct way to implement get_vblank_count for hw lacking a vblank counter is drm_vblank_no_hw_counter. Fix this up in mtk, which is the only offender left over. Cc: CK Hu Cc: Philipp Zabel Signed-off-by: Daniel Vetter Acked-by: Philipp Zabel --- drivers/gpu/drm/drm_irq.c | 37 +++++++++------------------------- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- 2 files changed, 11 insertions(+), 28 deletions(-) diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 2fb5861b04b7..1681e919b866 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -234,6 +234,16 @@ static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe, store_vblank(dev, pipe, diff, &t_vblank, cur_vblank); } +static u32 drm_vblank_count(struct drm_device *dev, unsigned int pipe) +{ + struct drm_vblank_crtc *vblank = &dev->vblank[pipe]; + + if (WARN_ON(pipe >= dev->num_crtcs)) + return 0; + + return vblank->count; +} + /** * drm_accurate_vblank_count - retrieve the master vblank counter * @crtc: which counter to retrieve @@ -888,31 +898,6 @@ drm_get_last_vbltimestamp(struct drm_device *dev, unsigned int pipe, } /** - * drm_vblank_count - retrieve "cooked" vblank counter value - * @dev: DRM device - * @pipe: index of CRTC for which to retrieve the counter - * - * Fetches the "cooked" vblank count value that represents the number of - * vblank events since the system was booted, including lost events due to - * modesetting activity. - * - * This is the legacy version of drm_crtc_vblank_count(). - * - * Returns: - * The software vblank counter. - */ -u32 drm_vblank_count(struct drm_device *dev, unsigned int pipe) -{ - struct drm_vblank_crtc *vblank = &dev->vblank[pipe]; - - if (WARN_ON(pipe >= dev->num_crtcs)) - return 0; - - return vblank->count; -} -EXPORT_SYMBOL(drm_vblank_count); - -/** * drm_crtc_vblank_count - retrieve "cooked" vblank counter value * @crtc: which counter to retrieve * @@ -920,8 +905,6 @@ EXPORT_SYMBOL(drm_vblank_count); * vblank events since the system was booted, including lost events due to * modesetting activity. * - * This is the native KMS version of drm_vblank_count(). - * * Returns: * The software vblank counter. */ diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index d90152e85ed0..4b7fe7eaec01 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -256,7 +256,7 @@ static struct drm_driver mtk_drm_driver = { .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC, - .get_vblank_counter = drm_vblank_count, + .get_vblank_counter = drm_vblank_no_hw_counter, .enable_vblank = mtk_drm_crtc_enable_vblank, .disable_vblank = mtk_drm_crtc_disable_vblank,