From patchwork Mon Nov 3 14:54:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Pargmann X-Patchwork-Id: 5217311 Return-Path: X-Original-To: patchwork-linux-arm@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 16B8CC11AC for ; Mon, 3 Nov 2014 14:57:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 515F42015A for ; Mon, 3 Nov 2014 14:57:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4C70120125 for ; Mon, 3 Nov 2014 14:57:09 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XlJ2a-0007JS-EN; Mon, 03 Nov 2014 14:55:32 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XlJ2W-0007F0-Rl for linux-arm-kernel@lists.infradead.org; Mon, 03 Nov 2014 14:55:29 +0000 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1XlJ28-0001fn-Gz; Mon, 03 Nov 2014 15:55:04 +0100 Received: from mpa by dude.hi.pengutronix.de with local (Exim 4.84) (envelope-from ) id 1XlJ27-0001cJ-O3; Mon, 03 Nov 2014 15:55:03 +0100 From: Markus Pargmann To: Greg Kroah-Hartman Subject: [PATCH v2 3/3] imx-drm: parallel-display: Fix dpms mode handling Date: Mon, 3 Nov 2014 15:54:48 +0100 Message-Id: <1415026488-25309-4-git-send-email-mpa@pengutronix.de> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1415026488-25309-1-git-send-email-mpa@pengutronix.de> References: <1415026488-25309-1-git-send-email-mpa@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: mpa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141103_065529_136600_DD5D6D45 X-CRM114-Status: GOOD ( 12.64 ) X-Spam-Score: -0.6 (/) Cc: kernel@pengutronix.de, Denis Carikli , Markus Pargmann , linux-arm-kernel@lists.infradead.org, Philipp Zabel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 We have to call drm_panel_prepare() and drm_panel_unprepare() when switching on or off. This patch also replaces the if statement with an switch statement to only catch ON and OFF modes. Signed-off-by: Markus Pargmann --- drivers/staging/imx-drm/parallel-display.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/staging/imx-drm/parallel-display.c b/drivers/staging/imx-drm/parallel-display.c index 0992bbf01adc..62788177c9d4 100644 --- a/drivers/staging/imx-drm/parallel-display.c +++ b/drivers/staging/imx-drm/parallel-display.c @@ -106,10 +106,18 @@ static void imx_pd_encoder_dpms(struct drm_encoder *encoder, int mode) { struct imx_parallel_display *imxpd = enc_to_imxpd(encoder); - if (mode != DRM_MODE_DPMS_ON) - drm_panel_disable(imxpd->panel); - else + switch (mode) { + case DRM_MODE_DPMS_ON: + drm_panel_prepare(imxpd->panel); drm_panel_enable(imxpd->panel); + break; + case DRM_MODE_DPMS_OFF: + drm_panel_disable(imxpd->panel); + drm_panel_unprepare(imxpd->panel); + break; + default: + break; + } } static bool imx_pd_encoder_mode_fixup(struct drm_encoder *encoder,