diff --git a/drivers/gpu/drm/tegra/gr3d.c b/drivers/gpu/drm/tegra/gr3d.c
index 8b9a35b1cbb3..35d1dff067b7 100644
--- a/drivers/gpu/drm/tegra/gr3d.c
+++ b/drivers/gpu/drm/tegra/gr3d.c
@@ -176,16 +176,16 @@ static const struct of_device_id tegra_gr3d_match[] = {
 MODULE_DEVICE_TABLE(of, tegra_gr3d_match);
 
 static const u32 gr3d_addr_regs[] = {
-	GR3D_IDX_ATTRIBUTE( 0),
-	GR3D_IDX_ATTRIBUTE( 1),
-	GR3D_IDX_ATTRIBUTE( 2),
-	GR3D_IDX_ATTRIBUTE( 3),
-	GR3D_IDX_ATTRIBUTE( 4),
-	GR3D_IDX_ATTRIBUTE( 5),
-	GR3D_IDX_ATTRIBUTE( 6),
-	GR3D_IDX_ATTRIBUTE( 7),
-	GR3D_IDX_ATTRIBUTE( 8),
-	GR3D_IDX_ATTRIBUTE( 9),
+	GR3D_IDX_ATTRIBUTE(0),
+	GR3D_IDX_ATTRIBUTE(1),
+	GR3D_IDX_ATTRIBUTE(2),
+	GR3D_IDX_ATTRIBUTE(3),
+	GR3D_IDX_ATTRIBUTE(4),
+	GR3D_IDX_ATTRIBUTE(5),
+	GR3D_IDX_ATTRIBUTE(6),
+	GR3D_IDX_ATTRIBUTE(7),
+	GR3D_IDX_ATTRIBUTE(8),
+	GR3D_IDX_ATTRIBUTE(9),
 	GR3D_IDX_ATTRIBUTE(10),
 	GR3D_IDX_ATTRIBUTE(11),
 	GR3D_IDX_ATTRIBUTE(12),
@@ -196,16 +196,16 @@ static const u32 gr3d_addr_regs[] = {
 	GR3D_QR_ZTAG_ADDR,
 	GR3D_QR_CTAG_ADDR,
 	GR3D_QR_CZ_ADDR,
-	GR3D_TEX_TEX_ADDR( 0),
-	GR3D_TEX_TEX_ADDR( 1),
-	GR3D_TEX_TEX_ADDR( 2),
-	GR3D_TEX_TEX_ADDR( 3),
-	GR3D_TEX_TEX_ADDR( 4),
-	GR3D_TEX_TEX_ADDR( 5),
-	GR3D_TEX_TEX_ADDR( 6),
-	GR3D_TEX_TEX_ADDR( 7),
-	GR3D_TEX_TEX_ADDR( 8),
-	GR3D_TEX_TEX_ADDR( 9),
+	GR3D_TEX_TEX_ADDR(0),
+	GR3D_TEX_TEX_ADDR(1),
+	GR3D_TEX_TEX_ADDR(2),
+	GR3D_TEX_TEX_ADDR(3),
+	GR3D_TEX_TEX_ADDR(4),
+	GR3D_TEX_TEX_ADDR(5),
+	GR3D_TEX_TEX_ADDR(6),
+	GR3D_TEX_TEX_ADDR(7),
+	GR3D_TEX_TEX_ADDR(8),
+	GR3D_TEX_TEX_ADDR(9),
 	GR3D_TEX_TEX_ADDR(10),
 	GR3D_TEX_TEX_ADDR(11),
 	GR3D_TEX_TEX_ADDR(12),
@@ -213,16 +213,16 @@ static const u32 gr3d_addr_regs[] = {
 	GR3D_TEX_TEX_ADDR(14),
 	GR3D_TEX_TEX_ADDR(15),
 	GR3D_DW_MEMORY_OUTPUT_ADDRESS,
-	GR3D_GLOBAL_SURFADDR( 0),
-	GR3D_GLOBAL_SURFADDR( 1),
-	GR3D_GLOBAL_SURFADDR( 2),
-	GR3D_GLOBAL_SURFADDR( 3),
-	GR3D_GLOBAL_SURFADDR( 4),
-	GR3D_GLOBAL_SURFADDR( 5),
-	GR3D_GLOBAL_SURFADDR( 6),
-	GR3D_GLOBAL_SURFADDR( 7),
-	GR3D_GLOBAL_SURFADDR( 8),
-	GR3D_GLOBAL_SURFADDR( 9),
+	GR3D_GLOBAL_SURFADDR(0),
+	GR3D_GLOBAL_SURFADDR(1),
+	GR3D_GLOBAL_SURFADDR(2),
+	GR3D_GLOBAL_SURFADDR(3),
+	GR3D_GLOBAL_SURFADDR(4),
+	GR3D_GLOBAL_SURFADDR(5),
+	GR3D_GLOBAL_SURFADDR(6),
+	GR3D_GLOBAL_SURFADDR(7),
+	GR3D_GLOBAL_SURFADDR(8),
+	GR3D_GLOBAL_SURFADDR(9),
 	GR3D_GLOBAL_SURFADDR(10),
 	GR3D_GLOBAL_SURFADDR(11),
 	GR3D_GLOBAL_SURFADDR(12),
@@ -230,48 +230,48 @@ static const u32 gr3d_addr_regs[] = {
 	GR3D_GLOBAL_SURFADDR(14),
 	GR3D_GLOBAL_SURFADDR(15),
 	GR3D_GLOBAL_SPILLSURFADDR,
-	GR3D_GLOBAL_SURFOVERADDR( 0),
-	GR3D_GLOBAL_SURFOVERADDR( 1),
-	GR3D_GLOBAL_SURFOVERADDR( 2),
-	GR3D_GLOBAL_SURFOVERADDR( 3),
-	GR3D_GLOBAL_SURFOVERADDR( 4),
-	GR3D_GLOBAL_SURFOVERADDR( 5),
-	GR3D_GLOBAL_SURFOVERADDR( 6),
-	GR3D_GLOBAL_SURFOVERADDR( 7),
-	GR3D_GLOBAL_SURFOVERADDR( 8),
-	GR3D_GLOBAL_SURFOVERADDR( 9),
+	GR3D_GLOBAL_SURFOVERADDR(0),
+	GR3D_GLOBAL_SURFOVERADDR(1),
+	GR3D_GLOBAL_SURFOVERADDR(2),
+	GR3D_GLOBAL_SURFOVERADDR(3),
+	GR3D_GLOBAL_SURFOVERADDR(4),
+	GR3D_GLOBAL_SURFOVERADDR(5),
+	GR3D_GLOBAL_SURFOVERADDR(6),
+	GR3D_GLOBAL_SURFOVERADDR(7),
+	GR3D_GLOBAL_SURFOVERADDR(8),
+	GR3D_GLOBAL_SURFOVERADDR(9),
 	GR3D_GLOBAL_SURFOVERADDR(10),
 	GR3D_GLOBAL_SURFOVERADDR(11),
 	GR3D_GLOBAL_SURFOVERADDR(12),
 	GR3D_GLOBAL_SURFOVERADDR(13),
 	GR3D_GLOBAL_SURFOVERADDR(14),
 	GR3D_GLOBAL_SURFOVERADDR(15),
-	GR3D_GLOBAL_SAMP01SURFADDR( 0),
-	GR3D_GLOBAL_SAMP01SURFADDR( 1),
-	GR3D_GLOBAL_SAMP01SURFADDR( 2),
-	GR3D_GLOBAL_SAMP01SURFADDR( 3),
-	GR3D_GLOBAL_SAMP01SURFADDR( 4),
-	GR3D_GLOBAL_SAMP01SURFADDR( 5),
-	GR3D_GLOBAL_SAMP01SURFADDR( 6),
-	GR3D_GLOBAL_SAMP01SURFADDR( 7),
-	GR3D_GLOBAL_SAMP01SURFADDR( 8),
-	GR3D_GLOBAL_SAMP01SURFADDR( 9),
+	GR3D_GLOBAL_SAMP01SURFADDR(0),
+	GR3D_GLOBAL_SAMP01SURFADDR(1),
+	GR3D_GLOBAL_SAMP01SURFADDR(2),
+	GR3D_GLOBAL_SAMP01SURFADDR(3),
+	GR3D_GLOBAL_SAMP01SURFADDR(4),
+	GR3D_GLOBAL_SAMP01SURFADDR(5),
+	GR3D_GLOBAL_SAMP01SURFADDR(6),
+	GR3D_GLOBAL_SAMP01SURFADDR(7),
+	GR3D_GLOBAL_SAMP01SURFADDR(8),
+	GR3D_GLOBAL_SAMP01SURFADDR(9),
 	GR3D_GLOBAL_SAMP01SURFADDR(10),
 	GR3D_GLOBAL_SAMP01SURFADDR(11),
 	GR3D_GLOBAL_SAMP01SURFADDR(12),
 	GR3D_GLOBAL_SAMP01SURFADDR(13),
 	GR3D_GLOBAL_SAMP01SURFADDR(14),
 	GR3D_GLOBAL_SAMP01SURFADDR(15),
-	GR3D_GLOBAL_SAMP23SURFADDR( 0),
-	GR3D_GLOBAL_SAMP23SURFADDR( 1),
-	GR3D_GLOBAL_SAMP23SURFADDR( 2),
-	GR3D_GLOBAL_SAMP23SURFADDR( 3),
-	GR3D_GLOBAL_SAMP23SURFADDR( 4),
-	GR3D_GLOBAL_SAMP23SURFADDR( 5),
-	GR3D_GLOBAL_SAMP23SURFADDR( 6),
-	GR3D_GLOBAL_SAMP23SURFADDR( 7),
-	GR3D_GLOBAL_SAMP23SURFADDR( 8),
-	GR3D_GLOBAL_SAMP23SURFADDR( 9),
+	GR3D_GLOBAL_SAMP23SURFADDR(0),
+	GR3D_GLOBAL_SAMP23SURFADDR(1),
+	GR3D_GLOBAL_SAMP23SURFADDR(2),
+	GR3D_GLOBAL_SAMP23SURFADDR(3),
+	GR3D_GLOBAL_SAMP23SURFADDR(4),
+	GR3D_GLOBAL_SAMP23SURFADDR(5),
+	GR3D_GLOBAL_SAMP23SURFADDR(6),
+	GR3D_GLOBAL_SAMP23SURFADDR(7),
+	GR3D_GLOBAL_SAMP23SURFADDR(8),
+	GR3D_GLOBAL_SAMP23SURFADDR(9),
 	GR3D_GLOBAL_SAMP23SURFADDR(10),
 	GR3D_GLOBAL_SAMP23SURFADDR(11),
 	GR3D_GLOBAL_SAMP23SURFADDR(12),
