tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/amdgpu/discovery: use hardcoded mmRCC_CONFIG_MEMSIZE

Browse Source 
register base offset of nbio is not known before IP Discovery table is
parsed, so hardcode this value.

Signed-off-by: Xiaojie Yuan <xiaojie.yuan@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Xiaojie Yuan
2019-03-27 12:29:49 +08:00
committed by Alex Deucher
parent 70cbfe3d64
commit 85f267a707
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+6 -6
View File
@@ -28,10 +28,11 @@
#include "nbio/nbio_2_3_offset.h" #include "nbio/nbio_2_3_offset.h"
#include "discovery.h" #include "discovery.h"
#define mmMM_INDEX 0x0 #define mmRCC_CONFIG_MEMSIZE 0xde3
#define mmMM_INDEX_HI 0x6 #define mmMM_INDEX 0x0
#define mmMM_DATA 0x1 #define mmMM_INDEX_HI 0x6
#define HW_ID_MAX 300 #define mmMM_DATA 0x1
#define HW_ID_MAX 300
const char *hw_id_names[HW_ID_MAX] = { const char *hw_id_names[HW_ID_MAX] = {
[MP1_HWID] = "MP1", [MP1_HWID] = "MP1",
@@ -134,8 +135,7 @@ static int hw_id_map[MAX_HWIP] = {
static int amdgpu_discovery_read_binary(struct amdgpu_device *adev, uint8_t *binary) static int amdgpu_discovery_read_binary(struct amdgpu_device *adev, uint8_t *binary)
{ {
uint32_t *p = (uint32_t *)binary; uint32_t *p = (uint32_t *)binary;
uint64_t vram_size = RREG32_SOC15(NBIO, 0, uint64_t vram_size = (uint64_t)RREG32(mmRCC_CONFIG_MEMSIZE) << 20;
mmRCC_DEV0_EPF0_RCC_CONFIG_MEMSIZE) * 1024 * 1024;
uint64_t pos = vram_size - BINARY_MAX_SIZE; uint64_t pos = vram_size - BINARY_MAX_SIZE;
unsigned long flags; unsigned long flags;