From patchwork Mon Apr 23 16:16:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tom Callaway X-Patchwork-Id: 10357463 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 3047D6053D for ; Mon, 23 Apr 2018 16:16:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 209B728BA8 for ; Mon, 23 Apr 2018 16:16:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1564128BB0; Mon, 23 Apr 2018 16:16:54 +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=-5.2 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED 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 9EFA228BAA for ; Mon, 23 Apr 2018 16:16:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 880606E254; Mon, 23 Apr 2018 16:16:52 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2870A6E254 for ; Mon, 23 Apr 2018 16:16:52 +0000 (UTC) Received: by mail-qk0-f195.google.com with SMTP id c136so16672035qkb.12 for ; Mon, 23 Apr 2018 09:16:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=42XswEVLS7ncp4EgBmrqjJ9kpdeFiO4yeN0sc4e3sfI=; b=sl/F2BjT6BY7m9xlIwwQoC0+1nYko1Q3RTkyX0sK92RYGgehhGeFvjoEX8+//8P5Q/ up48m2LXAzwdExU/0Y4VVQ1ICeCv2yT3LQHDTlwg1Aym9tEAy5gTIOoy1dYdg4OPtQqX UYhl/RKjYTrLvF96xyugy5UXfFOFjD7C9NKnMn7uNxbKZa5xkLKu1jbGKrmAAO7z+hhl pOw4KUebmB4OxhNBhj+W0fyZ2Nw7QXTiRtS7uTFrOvCcWgOkcWnpq7lnpXiFENpniOmz cKiwBSjIlcTmf4lkSatOGKHvDyqlMPhtJGoGVyC/4+vH5zcGGu0PkBV8rYEKEsTc5oMb VWEQ== X-Gm-Message-State: ALQs6tA+FyCbQObov+Ru9VVBg6vAGVXUUxRnk8Pq1BsnVO2cxXrjVSvJ WlHtFlFf81ZbGqJIF69OzZTEdA== X-Google-Smtp-Source: AB8JxZo+Yl+N1efPG/BKQXw+agqrgvoEn4SxetEV3djiE6BzwG2yNCumRKYqQ/LBCPaFSuqIu6f1JQ== X-Received: by 10.55.17.146 with SMTP id 18mr21983585qkr.435.1524500210960; Mon, 23 Apr 2018 09:16:50 -0700 (PDT) Received: from behemoth.com (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id u22-v6sm11414399qte.36.2018.04.23.09.16.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Apr 2018 09:16:50 -0700 (PDT) From: Tom Callaway To: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , David Airlie , dri-devel@lists.freedesktop.org Subject: [PATCH] drm/tinydrm/mi0283qt: Always set rotation value Date: Mon, 23 Apr 2018 12:16:39 -0400 Message-Id: <20180423161639.14420-1-tcallawa@redhat.com> X-Mailer: git-send-email 2.14.3 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tom Callaway MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP The PiTFT (ili9340) has a hardware reset circuit that resets only on power-on and not on each reboot through a gpio like the rpi-display does. As a result, we need to always apply the rotation value regardless of the display "on/off" state. Moved the rotation setting code below out_enable:. Signed-off-by: Tom Callaway Reviewed-by: Noralf Trønnes --- drivers/gpu/drm/tinydrm/mi0283qt.c | 41 +++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/tinydrm/mi0283qt.c b/drivers/gpu/drm/tinydrm/mi0283qt.c index 4e6d2ee94e55..2bb9e3ce4823 100644 --- a/drivers/gpu/drm/tinydrm/mi0283qt.c +++ b/drivers/gpu/drm/tinydrm/mi0283qt.c @@ -84,24 +84,6 @@ static void mi0283qt_enable(struct drm_simple_display_pipe *pipe, /* Memory Access Control */ mipi_dbi_command(mipi, MIPI_DCS_SET_PIXEL_FORMAT, MIPI_DCS_PIXEL_FMT_16BIT); - switch (mipi->rotation) { - default: - addr_mode = ILI9341_MADCTL_MV | ILI9341_MADCTL_MY | - ILI9341_MADCTL_MX; - break; - case 90: - addr_mode = ILI9341_MADCTL_MY; - break; - case 180: - addr_mode = ILI9341_MADCTL_MV; - break; - case 270: - addr_mode = ILI9341_MADCTL_MX; - break; - } - addr_mode |= ILI9341_MADCTL_BGR; - mipi_dbi_command(mipi, MIPI_DCS_SET_ADDRESS_MODE, addr_mode); - /* Frame Rate */ mipi_dbi_command(mipi, ILI9341_FRMCTR1, 0x00, 0x1b); @@ -127,6 +109,29 @@ static void mi0283qt_enable(struct drm_simple_display_pipe *pipe, msleep(100); out_enable: + /* The PiTFT (ili9340) has a hardware reset circuit that + * resets only on power-on and not on each reboot through + * a gpio like the rpi-display does. + * As a result, we need to always apply the rotation value + * regardless of the display "on/off" state. + */ + switch (mipi->rotation) { + default: + addr_mode = ILI9341_MADCTL_MV | ILI9341_MADCTL_MY | + ILI9341_MADCTL_MX; + break; + case 90: + addr_mode = ILI9341_MADCTL_MY; + break; + case 180: + addr_mode = ILI9341_MADCTL_MV; + break; + case 270: + addr_mode = ILI9341_MADCTL_MX; + break; + } + addr_mode |= ILI9341_MADCTL_BGR; + mipi_dbi_command(mipi, MIPI_DCS_SET_ADDRESS_MODE, addr_mode); mipi_dbi_enable_flush(mipi, crtc_state, plane_state); }