1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
From a89dcdb1420cff2b4f0ac948d459fe6cb7a72b31 Mon Sep 17 00:00:00 2001
From: Junwei Zhang <Jerry.Zhang@amd.com>
Date: Tue, 6 Feb 2018 16:24:54 +0800
Subject: [PATCH 0130/2940] drm/amdkcl: rename WM_COUNT to WM_COUNT_PP for
compiling
Change-Id: I02353d43368a8989d47ef0d6d14167bc62bcbc34
Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
---
drivers/gpu/drm/amd/powerplay/inc/smu10_driver_if.h | 4 ++--
drivers/gpu/drm/amd/powerplay/inc/smu9_driver_if.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu10_driver_if.h b/drivers/gpu/drm/amd/powerplay/inc/smu10_driver_if.h
index dea8fe93da63..1c04cf6e1d56 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/smu10_driver_if.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/smu10_driver_if.h
@@ -62,11 +62,11 @@ typedef struct {
typedef enum {
WM_SOCCLK = 0,
WM_DCFCLK,
- WM_COUNT,
+ WM_COUNT_PP,
} WM_CLOCK_e;
typedef struct {
- WatermarkRowGeneric_t WatermarkRow[WM_COUNT][NUM_WM_RANGES];
+ WatermarkRowGeneric_t WatermarkRow[WM_COUNT_PP][NUM_WM_RANGES];
uint32_t MmHubPadding[7];
} Watermarks_t;
diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu9_driver_if.h b/drivers/gpu/drm/amd/powerplay/inc/smu9_driver_if.h
index 2818c98ff5ca..025518424f7a 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/smu9_driver_if.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/smu9_driver_if.h
@@ -339,12 +339,12 @@ typedef struct {
typedef enum {
WM_SOCCLK = 0,
WM_DCEFCLK,
- WM_COUNT,
+ WM_COUNT_PP,
} WM_CLOCK_e;
typedef struct {
/* Watermarks */
- WatermarkRowGeneric_t WatermarkRow[WM_COUNT][NUM_WM_RANGES];
+ WatermarkRowGeneric_t WatermarkRow[WM_COUNT_PP][NUM_WM_RANGES];
uint32_t MmHubPadding[7]; /* SMU internal use */
} Watermarks_t;
--
2.17.1
|
