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: 5057041 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6EA3EC11AB for ; Thu, 9 Oct 2014 08:42:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 989112015D for ; Thu, 9 Oct 2014 08:42:16 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 09AF02015A for ; Thu, 9 Oct 2014 08:42:12 +0000 (UTC) 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-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; bh=L3XdrROY3uinTmfwVyXsfM4kWSsTJ6MlpOkbWNHcxP0=; b=Z6IB3Fosm81cPEQdeQEl8x8c1zrfvY02HUu639KebdIsY3w5Q9cQ12Rp0eGdoOaX5D pvIV5SzrPOPzRDI+N90CzgJDtgLTEoYbqabdD2Git1GI0rXEfYNK9bcMjEbK+Ur2msk7 r6w+haGvEkafRxmJQT1OIT+0O6v+z6TBopf1arSKzOgV/Qe3rYGJKslsTdWnspzErlUq u/TsH60DW3JDn3oIcpS8S+u5NUzCioBKH0KjbmhfqzMnRCmH2RWq2aoSzph4nS/cQ4kb 33nNE459MCOHgvixqaCvSa28/JjyTI/R0PkQl55HDPZIaCbNQBBMg7KMozEqncSa/NSW TD4A== X-Gm-Message-State: ALoCoQnueKHIhcW5JdOfRlvA97TfgoNjlCyWgRQEVAqJ9t0GlbedcNiBS6XVWBVq8rgqY8RTtOG3 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: 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-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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) {