From patchwork Fri Dec 5 08:35:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 41964 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D03AA26669 for ; Fri, 5 Dec 2014 08:36:10 +0000 (UTC) Received: by mail-wg0-f69.google.com with SMTP id k14sf140161wgh.0 for ; Fri, 05 Dec 2014 00:36:10 -0800 (PST) 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:in-reply-to:references:cc:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :mime-version:content-type:content-transfer-encoding:errors-to :sender:x-original-sender:x-original-authentication-results :mailing-list; bh=VM0cV1LdwqNNjXe1R8ydy51aYbyCWqtcm5HdUZsccKQ=; b=lUHXETiYMD8QyWAuqfobESKb+0CULFBkXomsNDoAre/CQ+Rjt4HXkkqKAMsCga7bWK XP5QZmHXJTkS40FAl4PaPvCCQuzyFSUT4Coic2rVOkV3qmbITWkMiwYaTQSvhdI6g24h /YN0uAPMe5Aoufr5JOJwIzk8F6QU2cMIpbrSG27bzMgDB3Jj3Bw0nPg6a/K1Ooz8W2dP PuDVOBFJ3J66uSSlYMPi5sAr0Ni4eGLXtbcOfDLlZ1b0jIEAKzw352LnBoiOvsIVapp8 FMoYhQbe9ehHLmrgBNOahf41Xr4LlF7hKmyYNLQBxa7vl3qiaaAfY3URht+uzfriycuX jB0g== X-Gm-Message-State: ALoCoQkFNTRM3JtTuUw3kJNATKB+G4D9WBUN1OElamzdPy3iMsM+OnuEzrEdV0tgqh47FLtY5cbM X-Received: by 10.112.168.228 with SMTP id zz4mr3168288lbb.7.1417768570055; Fri, 05 Dec 2014 00:36:10 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.202 with SMTP id u10ls282702lau.68.gmail; Fri, 05 Dec 2014 00:36:09 -0800 (PST) X-Received: by 10.152.23.9 with SMTP id i9mr1663223laf.81.1417768569944; Fri, 05 Dec 2014 00:36:09 -0800 (PST) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id bc1si28229559lbc.80.2014.12.05.00.36.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Dec 2014 00:36:09 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by mail-lb0-f176.google.com with SMTP id p9so169273lbv.7 for ; Fri, 05 Dec 2014 00:36:09 -0800 (PST) X-Received: by 10.112.173.202 with SMTP id bm10mr1682870lbc.74.1417768569819; Fri, 05 Dec 2014 00:36:09 -0800 (PST) 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.184.201 with SMTP id ew9csp173506lbc; Fri, 5 Dec 2014 00:36:09 -0800 (PST) X-Received: by 10.70.88.139 with SMTP id bg11mr26041767pdb.167.1417768566020; Fri, 05 Dec 2014 00:36:06 -0800 (PST) Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id ie3si37959753pad.149.2014.12.05.00.36.05 for ; Fri, 05 Dec 2014 00:36:06 -0800 (PST) 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 CD66F6E42F; Fri, 5 Dec 2014 00:36:03 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by gabe.freedesktop.org (Postfix) with ESMTP id 4EEBF6E422 for ; Fri, 5 Dec 2014 00:36:02 -0800 (PST) Received: by mail-wi0-f182.google.com with SMTP id h11so595998wiw.9 for ; Fri, 05 Dec 2014 00:36:01 -0800 (PST) X-Received: by 10.194.189.240 with SMTP id gl16mr21622590wjc.119.1417768561766; Fri, 05 Dec 2014 00:36:01 -0800 (PST) Received: from lmenx321.lme.st.com (LPuteaux-656-1-48-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPSA id eu8sm1299618wib.21.2014.12.05.00.36.00 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Dec 2014 00:36:01 -0800 (PST) From: Benjamin Gaignard To: dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 7/9] drm: sti: use drm_crtc_vblank_{on/off} instead of drm_vblank_{on/off} Date: Fri, 5 Dec 2014 09:35:05 +0100 Message-Id: <1417768507-7538-8-git-send-email-benjamin.gaignard@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1417768507-7538-1-git-send-email-benjamin.gaignard@linaro.org> References: <1417768507-7538-1-git-send-email-benjamin.gaignard@linaro.org> Cc: Benjamin Gaignard X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 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.176 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 f527997..3257dee 100644 --- a/drivers/gpu/drm/sti/sti_drm_crtc.c +++ b/drivers/gpu/drm/sti/sti_drm_crtc.c @@ -63,6 +63,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, @@ -223,7 +225,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) {