[PATCH] rcar-du: add/rename DEFR6 TCON bits

Sergei Shtylyov sergei.shtylyov at cogentembedded.com
Fri Apr 22 22:56:07 UTC 2016


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 <andrey.gusakov at cogentembedded.com>.

Signed-off-by: Andrey Gusakov <andrey.gusakov at cogentembedded.com>
Signed-off-by: Sergei Shtylyov <sergei.shtylyov at cogentembedded.com>

---
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



More information about the dri-devel mailing list