Skip to contentSkip to conversation

drm/amdgpu: reduce ip discovery data reading size

PATCH In review Wenhui.Sheng 2 participants 4 messages Jun 24, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: reduce ip discovery data reading size

From: Wenhui Sheng <[email protected]>

Only read first 4K data instead of whole TMR block, so we can reduce the time in full access mode.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -1
index b5d6274952a5..82c048766745 100644
@@ -133,7 +133,7 @@ static int hw_id_map[MAX_HWIP] = {
 static int amdgpu_discovery_read_binary(struct amdgpu_device *adev, uint8_t *binary)
 {
 	uint64_t vram_size = (uint64_t)RREG32(mmRCC_CONFIG_MEMSIZE) << 20;
-	uint64_t pos = vram_size - adev->discovery_tmr_size;
+	uint64_t pos = vram_size - DISCOVERY_TMR_OFFSET;
 
 	amdgpu_device_vram_access(adev, pos, (uint32_t *)binary,
 				  adev->discovery_tmr_size, false);
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h +2 -1
index d50d597c45ed..8f6183801cb3 100644
@@ -24,7 +24,8 @@
 #ifndef __AMDGPU_DISCOVERY__
 #define __AMDGPU_DISCOVERY__
 
-#define DISCOVERY_TMR_SIZE  (64 << 10)
+#define DISCOVERY_TMR_SIZE      (4 << 10)
+#define DISCOVERY_TMR_OFFSET    (64 << 10)
 
 void amdgpu_discovery_fini(struct amdgpu_device *adev);
 int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev);
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Reviewed-by on v1 1/1
#1 lore raw

[AMD Public Use]

Regards,
Hawking
-----Original Message-----
From: Sheng, Wenhui <[email protected]>
Sent: Wednesday, June 24, 2020 22:35
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Sheng, Wenhui <[email protected]>
Subject: [PATCH] drm/amdgpu: reduce ip discovery data reading size

From: Wenhui Sheng <[email protected]>

Only read first 4K data instead of whole TMR block, so we can reduce the time in full access mode.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 +-  drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -1
index b5d6274952a5..82c048766745 100644
@@ -133,7 +133,7 @@ static int hw_id_map[MAX_HWIP] = {  static int amdgpu_discovery_read_binary(struct amdgpu_device *adev, uint8_t *binary)  {
 	uint64_t vram_size = (uint64_t)RREG32(mmRCC_CONFIG_MEMSIZE) << 20;
-	uint64_t pos = vram_size - adev->discovery_tmr_size;
+	uint64_t pos = vram_size - DISCOVERY_TMR_OFFSET;
 
 	amdgpu_device_vram_access(adev, pos, (uint32_t *)binary,
 				  adev->discovery_tmr_size, false); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h

index d50d597c45ed..8f6183801cb3 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h +2 -2
@@ -24,7 +24,8 @@
 #ifndef __AMDGPU_DISCOVERY__
 #define __AMDGPU_DISCOVERY__
 
-#define DISCOVERY_TMR_SIZE  (64 << 10)
+#define DISCOVERY_TMR_SIZE      (4 << 10)
+#define DISCOVERY_TMR_OFFSET    (64 << 10)
 
 void amdgpu_discovery_fini(struct amdgpu_device *adev);  int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev);
--

2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reviewed-by
#2 lore raw

[AMD Public Use]

To make the description accurate, Let's say only read the first 4KB, starting from total_vram - 64KB, for ip discovery data.

As discussed, no matter the TMR block is 64KB or 1MB, the ip discovery data block always located in the same offset and with the same size (4KB)

Regards,
Hawking

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Zhang, Hawking
Sent: Wednesday, June 24, 2020 22:38
To: Sheng, Wenhui <[email protected]>; [email protected]
Cc: Zhang, Andy <[email protected]>; Liu, Shaoyun <[email protected]>
Subject: RE: [PATCH] drm/amdgpu: reduce ip discovery data reading size

[AMD Public Use]

Regards,
Hawking
-----Original Message-----
From: Sheng, Wenhui <[email protected]>
Sent: Wednesday, June 24, 2020 22:35
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Sheng, Wenhui <[email protected]>
Subject: [PATCH] drm/amdgpu: reduce ip discovery data reading size

From: Wenhui Sheng <[email protected]>

Only read first 4K data instead of whole TMR block, so we can reduce the time in full access mode.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 +-  drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -1
index b5d6274952a5..82c048766745 100644
@@ -133,7 +133,7 @@ static int hw_id_map[MAX_HWIP] = {  static int amdgpu_discovery_read_binary(struct amdgpu_device *adev, uint8_t *binary)  {
 	uint64_t vram_size = (uint64_t)RREG32(mmRCC_CONFIG_MEMSIZE) << 20;
-	uint64_t pos = vram_size - adev->discovery_tmr_size;
+	uint64_t pos = vram_size - DISCOVERY_TMR_OFFSET;
 
 	amdgpu_device_vram_access(adev, pos, (uint32_t *)binary,
 				  adev->discovery_tmr_size, false); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h

index d50d597c45ed..8f6183801cb3 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h +2 -2
@@ -24,7 +24,8 @@
 #ifndef __AMDGPU_DISCOVERY__
 #define __AMDGPU_DISCOVERY__
 
-#define DISCOVERY_TMR_SIZE  (64 << 10)
+#define DISCOVERY_TMR_SIZE      (4 << 10)
+#define DISCOVERY_TMR_OFFSET    (64 << 10)
 
 void amdgpu_discovery_fini(struct amdgpu_device *adev);  int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev);
--

2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7Chawking.zhang%40amd.com%7Cc75e531858a14284e76308d8184c237c%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637286062575076037&amp;sdata=SPvXL4K0IFq%2F2d1p%2FXYqGpOT%2FITSyDsKnBktFbBgW0M%3D&amp;reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

author Reviewed-by Hawking Zhang
#3 lore raw

[AMD Public Use]

Got it, will add more info in commit msg.

Brs
Wenhui
-----Original Message-----
From: Zhang, Hawking <[email protected]>
Sent: Wednesday, June 24, 2020 10:40 PM
To: Zhang, Hawking <[email protected]>; Sheng, Wenhui <[email protected]>; [email protected]
Cc: Zhang, Andy <[email protected]>; Liu, Shaoyun <[email protected]>
Subject: RE: [PATCH] drm/amdgpu: reduce ip discovery data reading size

[AMD Public Use]

To make the description accurate, Let's say only read the first 4KB, starting from total_vram - 64KB, for ip discovery data.

As discussed, no matter the TMR block is 64KB or 1MB, the ip discovery data block always located in the same offset and with the same size (4KB)

Regards,
Hawking

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Zhang, Hawking
Sent: Wednesday, June 24, 2020 22:38
To: Sheng, Wenhui <[email protected]>; [email protected]
Cc: Zhang, Andy <[email protected]>; Liu, Shaoyun <[email protected]>
Subject: RE: [PATCH] drm/amdgpu: reduce ip discovery data reading size

[AMD Public Use]

Regards,
Hawking
-----Original Message-----
From: Sheng, Wenhui <[email protected]>
Sent: Wednesday, June 24, 2020 22:35
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Sheng, Wenhui <[email protected]>
Subject: [PATCH] drm/amdgpu: reduce ip discovery data reading size

From: Wenhui Sheng <[email protected]>

Only read first 4K data instead of whole TMR block, so we can reduce the time in full access mode.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 +-  drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -1
index b5d6274952a5..82c048766745 100644
@@ -133,7 +133,7 @@ static int hw_id_map[MAX_HWIP] = {  static int amdgpu_discovery_read_binary(struct amdgpu_device *adev, uint8_t *binary)  {
 	uint64_t vram_size = (uint64_t)RREG32(mmRCC_CONFIG_MEMSIZE) << 20;
-	uint64_t pos = vram_size - adev->discovery_tmr_size;
+	uint64_t pos = vram_size - DISCOVERY_TMR_OFFSET;
 
 	amdgpu_device_vram_access(adev, pos, (uint32_t *)binary,
 				  adev->discovery_tmr_size, false); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h

index d50d597c45ed..8f6183801cb3 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h +2 -2
@@ -24,7 +24,8 @@
 #ifndef __AMDGPU_DISCOVERY__
 #define __AMDGPU_DISCOVERY__
 
-#define DISCOVERY_TMR_SIZE  (64 << 10)
+#define DISCOVERY_TMR_SIZE      (4 << 10)
+#define DISCOVERY_TMR_OFFSET    (64 << 10)
 
 void amdgpu_discovery_fini(struct amdgpu_device *adev);  int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev);
--

2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7Chawking.zhang%40amd.com%7Cc75e531858a14284e76308d8184c237c%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637286062575076037&amp;sdata=SPvXL4K0IFq%2F2d1p%2FXYqGpOT%2FITSyDsKnBktFbBgW0M%3D&amp;reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx