From patchwork Wed Sep 21 13:03:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Liu X-Patchwork-Id: 9345569 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 D5FA6607D0 for ; Thu, 22 Sep 2016 15:30:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C615C2856C for ; Thu, 22 Sep 2016 15:30:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BA61B2AAFC; Thu, 22 Sep 2016 15:30:17 +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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 79ADC2856C for ; Thu, 22 Sep 2016 15:30:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2C8726E8C7; Thu, 22 Sep 2016 15:29:51 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pa0-x243.google.com (mail-pa0-x243.google.com [IPv6:2607:f8b0:400e:c03::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id C68316E821 for ; Wed, 21 Sep 2016 13:03:32 +0000 (UTC) Received: by mail-pa0-x243.google.com with SMTP id hi10so2281213pac.2 for ; Wed, 21 Sep 2016 06:03:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=GPLM6+9jOVdS2QiRQw8CpTHq0XuWxW3Pw13ATkRU/gw=; b=qhwFf2SMZgjK537UKQhrg6fo/CjYlWIoHAU+pXtApvox95MU1eshrGSKJ2+C4Z2W71 CcdMfrGHx40P/IoiVZ8/4Vr3LVNrlG9SfOq2HGv62SuJWOJxB3tAS6KZv0824/8UmiP1 Z7mqdWkR7MWsliJmPnXDZuH8SO0HKbWZ87HRLt/WsN9I21I1ZInq12Zg5u217pRr6/zt TJ6izb9RmwxCYsLpzvEpV01bFDdG3FwTJQlmI7sGhwo3tkp9NFoyg7kphrF+nnRFfN5R fQzF7s0ECZ/q/QCr4NFU7TfvpKfHZZykC1FUWMbRT4DSlzBpUibJebvi0KR4nbGOq0ik vvMQ== 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=GPLM6+9jOVdS2QiRQw8CpTHq0XuWxW3Pw13ATkRU/gw=; b=CbERCxrh7cdMFkP5pg+Sqh1D4Z0ygnFb48UTpX8XaHxzQZNJSJQu26aXmgRCdP+cxs Tt+bFwDTZjM1/rRwAI+MyTwt5gtI4pfbTDs3rHXdbWGf8gD9sUz0lYVMsjVcniJMzvI8 Mgs3fCGwvjm6ulILFbhWrU2yLk6VkKhsiXqBF/zRrDWEVwIuvUond5bBAPOS91Fpihdt oOacVAqnRTx8TvwPZzg0LtiS9mgZhcfBZ0825qvHPgRDjoWwNjlus4SJewdphTmGUmA2 TkaYaQnUtXMsMFRf0A+Uvot90nFpqAeFb/dbjgXTMH1TI+NMDczQxrXz8sg5JZKDehwm lyaA== X-Gm-Message-State: AE9vXwPGyF7zU/ngG1rBppljBTGwx69K23KyLKVXPUdGwtwxf4MH/hQMJFUylewLR7ONxQ== X-Received: by 10.66.52.42 with SMTP id q10mr64488031pao.34.1474463012316; Wed, 21 Sep 2016 06:03:32 -0700 (PDT) Received: from 60-242-179-244.static.tpgi.com.au (60-242-179-244.static.tpgi.com.au. [60.242.179.244]) by smtp.gmail.com with ESMTPSA id t6sm5084952paa.45.2016.09.21.06.03.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Sep 2016 06:03:31 -0700 (PDT) From: Jonathan Liu To: Maxime Ripard Subject: [PATCH] drm/sun4i: rgb: Enable panel after controller Date: Wed, 21 Sep 2016 23:03:04 +1000 Message-Id: <20160921130304.3486-1-net147@gmail.com> X-Mailer: git-send-email 2.10.0 X-Mailman-Approved-At: Thu, 22 Sep 2016 15:29:45 +0000 Cc: Jonathan Liu , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Chen-Yu Tsai , linux-arm-kernel@lists.infradead.org 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 The panel should be enabled after the controller so that the panel prepare/enable delays are properly taken into account. Similarly, the panel should be disabled before the controller so that the panel unprepare/disable delays are properly taken into account. This is useful for avoiding visual glitches. Signed-off-by: Jonathan Liu --- drivers/gpu/drm/sun4i/sun4i_rgb.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c index c3ff10f..4e4bea6 100644 --- a/drivers/gpu/drm/sun4i/sun4i_rgb.c +++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c @@ -152,15 +152,16 @@ static void sun4i_rgb_encoder_enable(struct drm_encoder *encoder) DRM_DEBUG_DRIVER("Enabling RGB output\n"); - if (!IS_ERR(tcon->panel)) { + if (!IS_ERR(tcon->panel)) drm_panel_prepare(tcon->panel); - drm_panel_enable(tcon->panel); - } /* encoder->bridge can be NULL; drm_bridge_enable checks for it */ drm_bridge_enable(encoder->bridge); sun4i_tcon_channel_enable(tcon, 0); + + if (!IS_ERR(tcon->panel)) + drm_panel_enable(tcon->panel); } static void sun4i_rgb_encoder_disable(struct drm_encoder *encoder) @@ -171,15 +172,16 @@ static void sun4i_rgb_encoder_disable(struct drm_encoder *encoder) DRM_DEBUG_DRIVER("Disabling RGB output\n"); + if (!IS_ERR(tcon->panel)) + drm_panel_disable(tcon->panel); + sun4i_tcon_channel_disable(tcon, 0); /* encoder->bridge can be NULL; drm_bridge_disable checks for it */ drm_bridge_disable(encoder->bridge); - if (!IS_ERR(tcon->panel)) { - drm_panel_disable(tcon->panel); + if (!IS_ERR(tcon->panel)) drm_panel_unprepare(tcon->panel); - } } static void sun4i_rgb_encoder_mode_set(struct drm_encoder *encoder,