From patchwork Fri Apr 22 22:56:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 8924071 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 730599F441 for ; Mon, 25 Apr 2016 08:10:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 83063201BB for ; Mon, 25 Apr 2016 08:10:46 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 7337520166 for ; Mon, 25 Apr 2016 08:10:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5B1996E4BB; Mon, 25 Apr 2016 08:10:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf0-x230.google.com (mail-lf0-x230.google.com [IPv6:2a00:1450:4010:c07::230]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8DF326E386 for ; Fri, 22 Apr 2016 22:56:13 +0000 (UTC) Received: by mail-lf0-x230.google.com with SMTP id g184so87329611lfb.3 for ; Fri, 22 Apr 2016 15:56:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:organization:user-agent :mime-version:content-transfer-encoding; bh=DuSfAOeuy25ZFTNYq4+Mu8Q/s916lrkStLnVrsKN5To=; b=IQ6n3GWAsrbEDXm/9Px4bF1rhhSqm1SDeppKVh1pMvQGbrXEG/v4wtqLBMUGmSulOd mnNbJDul+VCrr0ZOmTde24W5Ln5keN3tbK6k8OcTAXy7lPJUF2ENOCx4YEdc+w9KjR8a Z3okBPZZ4MgTwqo1+JfhsNw3QR6oV5LBXm+av+Fu3Uyg5CNzQiiyij10UcfvRn/jP52t r60khgTnZ5cqHcJZt/xG0m4fQcFmzZvyBr6GvCP+oL7c2KkerC8b+GmRJ3IiM92N8g3c 9M44gzthhIsIL4SBUYJtvLQ64cIScABV+RFfO6vowSvxYhpaWeeMiYPNC+oxXnvXbefy NW5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:organization :user-agent:mime-version:content-transfer-encoding; bh=DuSfAOeuy25ZFTNYq4+Mu8Q/s916lrkStLnVrsKN5To=; b=FnK7oRzubiaIm5vXPJcbStthwZH/EMqwTqP4WEufo0xfCK2ZC/rUYoPl+mAVIXDCJ7 ULt9LVJiQg1EiC5g4nfLKygjYXv17iD+bALu+3GyCTDsxfWPpV+GWvpSOOANU+ZzLMUL ULb+25iFrzyXXfjX2inzqxBWUL9n2haEEESXPbokMpyzJbd/jSNTqd/EzxmKoAU5DjgJ TXGBBY6ARmXpXx+eRgTRyj+YJWSvgG6uK6UYxldCiYE4669LJgeY18w7IGq65CuW270q ebQH24babQep+RgRNhIx5SCd/h0EqEcUnqtsim2khkyouKjtEhf8e8Xxk+EIHtqgYEG1 mQkA== X-Gm-Message-State: AOPr4FXuTWgEcuHgSBViIc7M4KVkljmrRyxzBjClFLfDiMt77t6b5SXKQVTg0hgCrJSRHQ== X-Received: by 10.25.212.82 with SMTP id l79mr8492742lfg.72.1461365771271; Fri, 22 Apr 2016 15:56:11 -0700 (PDT) Received: from wasted.cogentembedded.com ([31.173.84.207]) by smtp.gmail.com with ESMTPSA id w125sm2042756lfa.10.2016.04.22.15.56.09 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 22 Apr 2016 15:56:09 -0700 (PDT) From: Sergei Shtylyov To: laurent.pinchart@ideasonboard.com, airlied@linux.ie, dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org Subject: [PATCH] rcar-du: add/rename DEFR6 TCON bits Date: Sat, 23 Apr 2016 01:56:07 +0300 Message-ID: <2036550.BKBaf2zquB@wasted.cogentembedded.com> Organization: Cogent Embedded Inc. User-Agent: KMail/4.14.10 (Linux/4.4.6-201.fc22.x86_64; KDE/4.14.17; x86_64; ; ) MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 25 Apr 2016 08:10:38 +0000 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 The TCNE2 bit of the DEFR6 register was renamed to TCNE1 in the R-Car gen2 manuals -- which makes more sense as that bit controls whether DU1, not DU2 is connected to TCON. While at it, add the TCNE0 bit which controls whether DU0 is connected to TCON. Based on the large patch by Andrey Gusakov . Signed-off-by: Andrey Gusakov Signed-off-by: Sergei Shtylyov Acked-by: Laurent Pinchart --- The patch is against David Airlie's 'linux.git' repo's 'drm-next' branch. drivers/gpu/drm/rcar-du/rcar_du_regs.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Index: linux/drivers/gpu/drm/rcar-du/rcar_du_regs.h =================================================================== --- linux.orig/drivers/gpu/drm/rcar-du/rcar_du_regs.h +++ linux/drivers/gpu/drm/rcar-du/rcar_du_regs.h @@ -195,9 +195,10 @@ #define DEFR6_ODPM12_DISP (2 << 8) #define DEFR6_ODPM12_CDE (3 << 8) #define DEFR6_ODPM12_MASK (3 << 8) -#define DEFR6_TCNE2 (1 << 6) +#define DEFR6_TCNE1 (1 << 6) +#define DEFR6_TCNE0 (1 << 4) #define DEFR6_MLOS1 (1 << 2) -#define DEFR6_DEFAULT (DEFR6_CODE | DEFR6_TCNE2) +#define DEFR6_DEFAULT (DEFR6_CODE | DEFR6_TCNE1) /* ----------------------------------------------------------------------------- * R8A7790-only Control Registers