From patchwork Thu Oct 9 08:41:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 38497 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DFB66202E7 for ; Thu, 9 Oct 2014 08:42:16 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id ge10sf461351lab.1 for ; Thu, 09 Oct 2014 01:42:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:subject:date :message-id:cc:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=a3oIRN496AMYeo/owxlzPCrBx91+W3hv4eVx8/Lof+Y=; b=LL3mzKw3Iml1peqOaAsY0W9S33nXCvC0fHxYqAlQijglGYerzl+AjU02P2dnZtrWBy LiHy1NHiAZXrSn5yz92W1pMgkcbm6iwbZJto9yQv+MJT5A1J9dcW+pu9VlSYChBQ8c36 pwqEhuFn6l+RK8KfF5kscbLW4FNwMknTrBN8SQcq4rLq/p7bU36Q2sUYmdH7cWUb/pxC RuxLgB+UdEHldSxTySQcKM+d3bVMHkPxbiHTSrBMDtNZtccFHWmKgOHznOoRDL034mHZ Yk70CiRvkyqZs2USRpHlW9dqKd8MpWGh0koNufgXfY6+dUtH/BxhpjIizBdMFzYiM5qc hKQw== X-Gm-Message-State: ALoCoQn9632J+nBQrvbwy9LqYOQvT7iGH92CyhWtDIwFGgo7sqCCyaxnyxRc4VtnehFX1ta/bvSE X-Received: by 10.112.52.165 with SMTP id u5mr193386lbo.12.1412844135715; Thu, 09 Oct 2014 01:42:15 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.135 with SMTP id k7ls130672lah.78.gmail; Thu, 09 Oct 2014 01:42:15 -0700 (PDT) X-Received: by 10.112.235.199 with SMTP id uo7mr16140563lbc.50.1412844135572; Thu, 09 Oct 2014 01:42:15 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com [209.85.217.179]) by mx.google.com with ESMTPS id b3si3221706laf.117.2014.10.09.01.42.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 09 Oct 2014 01:42:15 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by mail-lb0-f179.google.com with SMTP id l4so689186lbv.10 for ; Thu, 09 Oct 2014 01:42:15 -0700 (PDT) X-Received: by 10.152.26.226 with SMTP id o2mr2313093lag.44.1412844135444; Thu, 09 Oct 2014 01:42:15 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp203479lbz; Thu, 9 Oct 2014 01:42:14 -0700 (PDT) X-Received: by 10.50.176.202 with SMTP id ck10mr53685682igc.2.1412844132563; Thu, 09 Oct 2014 01:42:12 -0700 (PDT) Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id m4si8937511igx.47.2014.10.09.01.42.11 for ; Thu, 09 Oct 2014 01:42:12 -0700 (PDT) Received-SPF: none (google.com: dri-devel-bounces@lists.freedesktop.org does not designate permitted sender hosts) client-ip=131.252.210.177; Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 86A326E2BC; Thu, 9 Oct 2014 01:42:10 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by gabe.freedesktop.org (Postfix) with ESMTP id 88C346E2BC for ; Thu, 9 Oct 2014 01:42:09 -0700 (PDT) Received: by mail-wi0-f176.google.com with SMTP id hi2so12434641wib.3 for ; Thu, 09 Oct 2014 01:42:08 -0700 (PDT) X-Received: by 10.180.19.230 with SMTP id i6mr38942410wie.48.1412844128712; Thu, 09 Oct 2014 01:42:08 -0700 (PDT) Received: from lmenx321.lme.st.com (LPuteaux-656-01-48-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPSA id s1sm21202712wiw.6.2014.10.09.01.42.07 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 09 Oct 2014 01:42:08 -0700 (PDT) From: Benjamin Gaignard To: dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH] drm: sti: use drm_crtc_vblank_{on/off} instead of drm_vblank_{on/off} Date: Thu, 9 Oct 2014 10:41:11 +0200 Message-Id: <1412844072-11898-1-git-send-email-benjamin.gaignard@linaro.org> X-Mailer: git-send-email 1.9.1 Cc: Benjamin Gaignard X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: 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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: benjamin.gaignard@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Make sure that vblank is enabled when crtc commit is call. Replace drm_vblank_off() by drm_crtc_vblank_off() Signed-off-by: Benjamin Gaignard --- drivers/gpu/drm/sti/sti_drm_crtc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/sti/sti_drm_crtc.c b/drivers/gpu/drm/sti/sti_drm_crtc.c index d2ae0c0..38c4799 100644 --- a/drivers/gpu/drm/sti/sti_drm_crtc.c +++ b/drivers/gpu/drm/sti/sti_drm_crtc.c @@ -61,6 +61,8 @@ static void sti_drm_crtc_commit(struct drm_crtc *crtc) /* Enable layer on mixer */ if (sti_mixer_set_layer_status(mixer, layer, true)) DRM_ERROR("Can not enable layer at mixer\n"); + + drm_crtc_vblank_on(crtc); } static bool sti_drm_crtc_mode_fixup(struct drm_crtc *crtc, @@ -221,7 +223,7 @@ static void sti_drm_crtc_disable(struct drm_crtc *crtc) /* Then disable layer itself */ sti_layer_disable(layer); - drm_vblank_off(crtc->dev, mixer->id); + drm_crtc_vblank_off(crtc); /* Disable pixel clock and compo IP clocks */ if (mixer->id == STI_MIXER_MAIN) {