From patchwork Wed Jan 4 09:55:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 9496363 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 88474606A9 for ; Wed, 4 Jan 2017 09:56:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E83B27D8D for ; Wed, 4 Jan 2017 09:56:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 72B3B27DCD; Wed, 4 Jan 2017 09:56:30 +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_SIGNED, 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 34BC027D8D for ; Wed, 4 Jan 2017 09:56:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 43D426E20C; Wed, 4 Jan 2017 09:56:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x22a.google.com (mail-wm0-x22a.google.com [IPv6:2a00:1450:400c:c09::22a]) by gabe.freedesktop.org (Postfix) with ESMTPS id AF1CB6E212 for ; Wed, 4 Jan 2017 09:56:15 +0000 (UTC) Received: by mail-wm0-x22a.google.com with SMTP id k184so256067565wme.1 for ; Wed, 04 Jan 2017 01:56:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+hGJg1gNImwcbB58qCti1kGybEg/Ix4H8WSK2zFvSLc=; b=UA5Sv9F0ZLJpwz2eT7DBhIC1MDQ5DQEQam0tjy4kxTbce2cAQgJ69DcrDER/4OBCZm NGt6byiXREkZuDyLqSrrVhE2r+Yemn9JCkhoM9kPnMnbtRhBlGCcGT9oG3Xq5YLALTJm 769Z69wmC8M1opK0+mrS0Ve7D6c6LM8/3QNj0MRHGXf5BRJJ0uGE1ZUre3y00638+kDW Y3As3fNWejMJtE2/1bQy+p5kdNhDR7JQvF1ONUy/dtrNrPs+wqd/IpmD2bjj0ZkVSnoW imeXcpCOcOOeGqSmr+yHw/+gndGVK8PENibPjFRWiw9tfyzwpfS3HdLo2bvjRDc+Y8IL PtOQ== 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:in-reply-to :references; bh=+hGJg1gNImwcbB58qCti1kGybEg/Ix4H8WSK2zFvSLc=; b=iw7dtGx4XsmRMmQOnnzbnST2inU2ohlQmUWegG6veLJf79HDXHZfxg+CwyMM69aMZI H71E3el5cgXBowlrzwW715r+xlqBOTpOc43CEmLRCdYukEppmi9tawWsl9HEUlkkvm49 uKoZARV8TOVYMH1TnAMenQZWyH3eUZ+yHmEz/+mAi+4xwCuHTT9irRGwvEE9zouKt2Nn 8/ujYj92MPpDn3WCnJ1n0CWeaKnyRfv4KQnIKKP68ncO7SDloJLOmz+pXoxPiTpd2+z9 I3fvyP5f2QM75dlucbEjnwNElPdQoqi/YuzJy6ryiSP82qZqZbpxJ7HXVc6Ig8A47pLN HsFQ== X-Gm-Message-State: AIkVDXIjT6HXiEPTe3DrOhuLGCdCIpvFsqgcmDOhrjcDERDsTa+tl8Hfsd9uwpCTwdNhcq7V X-Received: by 10.28.12.80 with SMTP id 77mr61692256wmm.106.1483523773722; Wed, 04 Jan 2017 01:56:13 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id d184sm94697455wmd.8.2017.01.04.01.56.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Jan 2017 01:56:13 -0800 (PST) From: Neil Armstrong To: airlied@linux.ie, daniel@ffwll.ch Subject: [PATCH 2/2] drm/meson: Fix CVBS VDAC disable Date: Wed, 4 Jan 2017 10:55:52 +0100 Message-Id: <1483523752-14705-3-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1483523752-14705-1-git-send-email-narmstrong@baylibre.com> References: <1483523752-14705-1-git-send-email-narmstrong@baylibre.com> Cc: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, Neil Armstrong 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 This commit fixes the VDAC disabling register write values. Fixes: bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller") Signed-off-by: Neil Armstrong --- drivers/gpu/drm/meson/meson_venc_cvbs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/meson/meson_venc_cvbs.c b/drivers/gpu/drm/meson/meson_venc_cvbs.c index c809c08..a2bcc70 100644 --- a/drivers/gpu/drm/meson/meson_venc_cvbs.c +++ b/drivers/gpu/drm/meson/meson_venc_cvbs.c @@ -167,7 +167,7 @@ static void meson_venc_cvbs_encoder_disable(struct drm_encoder *encoder) /* Disable CVBS VDAC */ regmap_write(priv->hhi, HHI_VDAC_CNTL0, 0); - regmap_write(priv->hhi, HHI_VDAC_CNTL1, 0); + regmap_write(priv->hhi, HHI_VDAC_CNTL1, 8); } static void meson_venc_cvbs_encoder_enable(struct drm_encoder *encoder)