Skip to content

Commit 75be61a

Browse files
Pratap Nirujogialexdeucher
authored andcommitted
drm/amd/amdgpu: Enable MMHUB prefetch for ISP v4.1.0 and 4.1.1
Remove temporary WA to disable ISP prefetch as MMHUB SAW is initialized to support ISP HW access GART memory using the TLSi path with prefetch enabled. Signed-off-by: Pratap Nirujogi <[email protected]> Reviewed-by: Mario Limonciello <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 7c2d311 commit 75be61a

File tree

4 files changed

+0
-38
lines changed

4 files changed

+0
-38
lines changed

drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,18 +104,6 @@ static int isp_v4_1_0_hw_init(struct amdgpu_isp *isp)
104104
goto failure;
105105
}
106106

107-
/*
108-
* Temporary WA added to disable MMHUB TLSi until the GART initialization
109-
* is ready to support MMHUB TLSi and SAW for ISP HW to access GART memory
110-
* using the TLSi path
111-
*/
112-
WREG32(mmDAGB0_WRCLI5_V4_1 >> 2, 0xFE5FEAA8);
113-
WREG32(mmDAGB0_WRCLI9_V4_1 >> 2, 0xFE5FEAA8);
114-
WREG32(mmDAGB0_WRCLI10_V4_1 >> 2, 0xFE5FEAA8);
115-
WREG32(mmDAGB0_WRCLI14_V4_1 >> 2, 0xFE5FEAA8);
116-
WREG32(mmDAGB0_WRCLI19_V4_1 >> 2, 0xFE5FEAA8);
117-
WREG32(mmDAGB0_WRCLI20_V4_1 >> 2, 0xFE5FEAA8);
118-
119107
return 0;
120108

121109
failure:

drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,6 @@
3232

3333
#include "ivsrcid/isp/irqsrcs_isp_4_1.h"
3434

35-
#define mmDAGB0_WRCLI5_V4_1 0x6811C
36-
#define mmDAGB0_WRCLI9_V4_1 0x6812C
37-
#define mmDAGB0_WRCLI10_V4_1 0x68130
38-
#define mmDAGB0_WRCLI14_V4_1 0x68140
39-
#define mmDAGB0_WRCLI19_V4_1 0x68154
40-
#define mmDAGB0_WRCLI20_V4_1 0x68158
41-
4235
#define MAX_ISP410_INT_SRC 8
4336

4437
void isp_v4_1_0_set_isp_funcs(struct amdgpu_isp *isp);

drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,18 +104,6 @@ static int isp_v4_1_1_hw_init(struct amdgpu_isp *isp)
104104
goto failure;
105105
}
106106

107-
/*
108-
* Temporary WA added to disable MMHUB TLSi until the GART initialization
109-
* is ready to support MMHUB TLSi and SAW for ISP HW to access GART memory
110-
* using the TLSi path
111-
*/
112-
WREG32(mmDAGB1_WRCLI5_V4_1_1 >> 2, 0xFE5FEAA8);
113-
WREG32(mmDAGB1_WRCLI9_V4_1_1 >> 2, 0xFE5FEAA8);
114-
WREG32(mmDAGB1_WRCLI10_V4_1_1 >> 2, 0xFE5FEAA8);
115-
WREG32(mmDAGB1_WRCLI14_V4_1_1 >> 2, 0xFE5FEAA8);
116-
WREG32(mmDAGB1_WRCLI19_V4_1_1 >> 2, 0xFE5FEAA8);
117-
WREG32(mmDAGB1_WRCLI20_V4_1_1 >> 2, 0xFE5FEAA8);
118-
119107
return 0;
120108

121109
failure:

drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,6 @@
3232

3333
#include "ivsrcid/isp/irqsrcs_isp_4_1.h"
3434

35-
#define mmDAGB1_WRCLI5_V4_1_1 0x68420
36-
#define mmDAGB1_WRCLI9_V4_1_1 0x68430
37-
#define mmDAGB1_WRCLI10_V4_1_1 0x68434
38-
#define mmDAGB1_WRCLI14_V4_1_1 0x68444
39-
#define mmDAGB1_WRCLI19_V4_1_1 0x68458
40-
#define mmDAGB1_WRCLI20_V4_1_1 0x6845C
41-
4235
#define MAX_ISP411_INT_SRC 8
4336

4437
void isp_v4_1_1_set_isp_funcs(struct amdgpu_isp *isp);

0 commit comments

Comments
 (0)