Skip to contentSkip to conversation

drm/amdgpu: simplify nv and soc21 read_register functions

PATCH In review Alex Deucher 2 participants 2 messages May 5, 2022

Subsystems (2)
lore
Share & tools
lore

Alex Deucher

author maintainer
#0 lore raw

PATCH 1/1 drm/amdgpu: simplify nv and soc21 read_register functions

Check of the base offset for the IP exists rather than explicitly checking for how many instances of a particular IP there are. This is what soc15.c already does. Expand this to nv.c and soc21.c.

---
 drivers/gpu/drm/amd/amdgpu/nv.c    | 6 +++---
 drivers/gpu/drm/amd/amdgpu/soc21.c | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/nv.c +3 -3
index 8ecfd66c4cee..d016e3c3e221 100644
@@ -392,9 +392,9 @@ static int nv_read_register(struct amdgpu_device *adev, u32 se_num,
 	*value = 0;
 	for (i = 0; i < ARRAY_SIZE(nv_allowed_read_registers); i++) {
 		en = &nv_allowed_read_registers[i];
-		if ((i == 7 && (adev->sdma.num_instances == 1)) || /* some asics don't have SDMA1 */
-		    reg_offset !=
-		    (adev->reg_offset[en->hwip][en->inst][en->seg] + en->reg_offset))
+		if (adev->reg_offset[en->hwip][en->inst] &&
+		    reg_offset != (adev->reg_offset[en->hwip][en->inst][en->seg]
+				   + en->reg_offset))
 			continue;
 
 		*value = nv_get_register_value(adev,
drivers/gpu/drm/amd/amdgpu/soc21.c +3 -2
index 9e689a1f2ea4..2f23cb8cd6e2 100644
@@ -252,8 +252,9 @@ static int soc21_read_register(struct amdgpu_device *adev, u32 se_num,
 	*value = 0;
 	for (i = 0; i < ARRAY_SIZE(soc21_allowed_read_registers); i++) {
 		en = &soc21_allowed_read_registers[i];
-		if (reg_offset !=
-		    (adev->reg_offset[en->hwip][en->inst][en->seg] + en->reg_offset))
+		if (adev->reg_offset[en->hwip][en->inst] &&
+		    reg_offset != (adev->reg_offset[en->hwip][en->inst][en->seg]
+				   + en->reg_offset))
 			continue;
 
 		*value = soc21_get_register_value(adev,
Signature · 1 line
2.35.1
#1 lore raw

Am 05.05.22 um 04:58 schrieb Alex Deucher:

Quoted 6 lines

Check of the base offset for the IP exists rather than explicitly checking for how many instances of a particular IP there are. This is what soc15.c already does. Expand this to nv.c and soc21.c.

I still think the higher level code should not read registers which aren't present in the first place. Could we add a WARN_ONCE() here maybe?

On the other hand I totally see why it is a good idea to not try to access something which isn't present. So Acked-by: Christian König <[email protected]> for now.

Quoted 38 lines
---
  drivers/gpu/drm/amd/amdgpu/nv.c    | 6 +++---
  drivers/gpu/drm/amd/amdgpu/soc21.c | 5 +++--
  2 files changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/nv.c +3 -3
index 8ecfd66c4cee..d016e3c3e221 100644
@@ -392,9 +392,9 @@ static int nv_read_register(struct amdgpu_device *adev, u32 se_num,
  	*value = 0;
  	for (i = 0; i < ARRAY_SIZE(nv_allowed_read_registers); i++) {
  		en = &nv_allowed_read_registers[i];
-		if ((i == 7 && (adev->sdma.num_instances == 1)) || /* some asics don't have SDMA1 */
-		    reg_offset !=
-		    (adev->reg_offset[en->hwip][en->inst][en->seg] + en->reg_offset))
+		if (adev->reg_offset[en->hwip][en->inst] &&
+		    reg_offset != (adev->reg_offset[en->hwip][en->inst][en->seg]
+				   + en->reg_offset))
  			continue;
 
  		*value = nv_get_register_value(adev,
drivers/gpu/drm/amd/amdgpu/soc21.c +3 -2
index 9e689a1f2ea4..2f23cb8cd6e2 100644
@@ -252,8 +252,9 @@ static int soc21_read_register(struct amdgpu_device *adev, u32 se_num,
  	*value = 0;
  	for (i = 0; i < ARRAY_SIZE(soc21_allowed_read_registers); i++) {
  		en = &soc21_allowed_read_registers[i];
-		if (reg_offset !=
-		    (adev->reg_offset[en->hwip][en->inst][en->seg] + en->reg_offset))
+		if (adev->reg_offset[en->hwip][en->inst] &&
+		    reg_offset != (adev->reg_offset[en->hwip][en->inst][en->seg]
+				   + en->reg_offset))
  			continue;
 
  		*value = soc21_get_register_value(adev,