[PATCH 17/18] drm/amdgpu: cleanup DCE6 a bit more

[Alexandre Demers <alexandre.f.demers@gmail.com>]

Use shifts already available in DCE6's defines, masks and shifts.

Signed-off-by: Alexandre Demers <alexandre.f.demers@gmail.com>
---
 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 4 ++--
 drivers/gpu/drm/amd/amdgpu/sid.h      | 8 --------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
index 19b267f1540b..761ba83385ac 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
@@ -1968,8 +1968,8 @@ static int dce_v6_0_crtc_do_set_base(struct drm_crtc *crtc,
 	case DRM_FORMAT_ABGR8888:
 		fb_format = ((GRPH_DEPTH_32BPP << GRPH_CONTROL__GRPH_DEPTH__SHIFT) |
 			     (GRPH_FORMAT_ARGB8888 << GRPH_CONTROL__GRPH_FORMAT__SHIFT));
-		fb_swap = (GRPH_RED_CROSSBAR(GRPH_RED_SEL_B) |
-			   GRPH_BLUE_CROSSBAR(GRPH_BLUE_SEL_R));
+		fb_swap = ((GRPH_RED_SEL_B << GRPH_SWAP_CNTL__GRPH_RED_CROSSBAR__SHIFT) |
+			   (GRPH_BLUE_SEL_R << GRPH_SWAP_CNTL__GRPH_BLUE_CROSSBAR__SHIFT));
 #ifdef __BIG_ENDIAN
 		fb_swap |= (GRPH_ENDIAN_8IN32 << GRPH_SWAP_CNTL__GRPH_ENDIAN_SWAP__SHIFT);
 #endif
diff --git a/drivers/gpu/drm/amd/amdgpu/sid.h b/drivers/gpu/drm/amd/amdgpu/sid.h
index b5d5ff639be4..6c6bf2154ce8 100644
--- a/drivers/gpu/drm/amd/amdgpu/sid.h
+++ b/drivers/gpu/drm/amd/amdgpu/sid.h
@@ -708,26 +708,18 @@
 #define ES_AND_GS_AUTO       3
 #define BUF_SWAP_32BIT       (2 << 16)
 
-
-#define GRPH_RED_CROSSBAR(x)           (((x) & 0x3) << 4)
 #define GRPH_RED_SEL_R                 0
 #define GRPH_RED_SEL_G                 1
 #define GRPH_RED_SEL_B                 2
 #define GRPH_RED_SEL_A                 3
-
-#define GRPH_GREEN_CROSSBAR(x)         (((x) & 0x3) << 6)
 #define GRPH_GREEN_SEL_G               0
 #define GRPH_GREEN_SEL_B               1
 #define GRPH_GREEN_SEL_A               2
 #define GRPH_GREEN_SEL_R               3
-
-#define GRPH_BLUE_CROSSBAR(x)          (((x) & 0x3) << 8)
 #define GRPH_BLUE_SEL_B                0
 #define GRPH_BLUE_SEL_A                1
 #define GRPH_BLUE_SEL_R                2
 #define GRPH_BLUE_SEL_G                3
-
-#define GRPH_ALPHA_CROSSBAR(x)         (((x) & 0x3) << 10)
 #define GRPH_ALPHA_SEL_A               0
 #define GRPH_ALPHA_SEL_R               1
 #define GRPH_ALPHA_SEL_G               2
-- 
2.48.1