Skip to contentSkip to conversation

drm/amdgpu: drop support for untouched registers

PATCH In review Christian König 2 participants 3 messages Apr 12, 2017 2 messages not in the archive

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

PATCH 1/2 drm/amdgpu: drop support for untouched registers

From: Christian König <[email protected]>

I couldn't figure out what this was original good for, but we don't use it any more.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h |   1 -
 drivers/gpu/drm/amd/amdgpu/cik.c    | 121 +++++++++++++-------------
 drivers/gpu/drm/amd/amdgpu/si.c     |  84 +++++++++---------
 drivers/gpu/drm/amd/amdgpu/soc15.c  |  50 ++++++-----
 drivers/gpu/drm/amd/amdgpu/vi.c     | 168 ++++++++++++++++++------------------
 5 files changed, 210 insertions(+), 214 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -1
index b7e7156..71364f5 100644
@@ -1296,7 +1296,6 @@ struct amdgpu_smumgr {
  */
 struct amdgpu_allowed_register_entry {
 	uint32_t reg_offset;
-	bool untouched;
 	bool grbm_indexed;
 };
 
drivers/gpu/drm/amd/amdgpu/cik.c +60 -61

133 lines not on this page · raw message

drivers/gpu/drm/amd/amdgpu/si.c +42 -42

99 lines not on this page · raw message

drivers/gpu/drm/amd/amdgpu/soc15.c +24 -26

68 lines not on this page · raw message

drivers/gpu/drm/amd/amdgpu/vi.c +84 -84

191 lines not on this page · raw message

Signature · 6 lines
2.5.0

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

A message that is not in the archive (sent off-list or not yet received): 1491999205-16286-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org

#2 lore raw

PATCH 2/2 drm/amdgpu: drop support for per ASIC read registers

From: Christian König <[email protected]>

Only per family registers are still used.

---
 drivers/gpu/drm/amd/amdgpu/soc15.c | 29 +-------------------------
 drivers/gpu/drm/amd/amdgpu/vi.c    | 42 +-------------------------------------
 2 files changed, 2 insertions(+), 69 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +1 -28
index 8917bde..2c05dab 100644
@@ -280,10 +280,6 @@ static bool soc15_read_bios_from_rom(struct amdgpu_device *adev,
 	return true;
 }
 
-static struct amdgpu_allowed_register_entry vega10_allowed_read_registers[] = {
-	/* todo */
-};
-
 static struct amdgpu_allowed_register_entry soc15_allowed_read_registers[] = {
 	{ SOC15_REG_OFFSET(GC, 0, mmGRBM_STATUS)},
 	{ SOC15_REG_OFFSET(GC, 0, mmGRBM_STATUS2)},
@@ -341,32 +337,9 @@ static uint32_t soc15_get_register_value(struct amdgpu_device *adev,
 static int soc15_read_register(struct amdgpu_device *adev, u32 se_num,
 			    u32 sh_num, u32 reg_offset, u32 *value)
 {
-	struct amdgpu_allowed_register_entry *asic_register_table = NULL;
-	struct amdgpu_allowed_register_entry *asic_register_entry;
-	uint32_t size, i;
+	uint32_t i;
 
 	*value = 0;
-	switch (adev->asic_type) {
-	case CHIP_VEGA10:
-		asic_register_table = vega10_allowed_read_registers;
-		size = ARRAY_SIZE(vega10_allowed_read_registers);
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	if (asic_register_table) {
-		for (i = 0; i < size; i++) {
-			asic_register_entry = asic_register_table + i;
-			if (reg_offset != asic_register_entry->reg_offset)
-				continue;
-			*value = soc15_get_register_value(adev,
-							  asic_register_entry->grbm_indexed,
-							  se_num, sh_num, reg_offset);
-			return 0;
-		}
-	}
-
 	for (i = 0; i < ARRAY_SIZE(soc15_allowed_read_registers); i++) {
 		if (reg_offset != soc15_allowed_read_registers[i].reg_offset)
 			continue;
drivers/gpu/drm/amd/amdgpu/vi.c +1 -41

56 lines not on this page · raw message

Signature · 6 lines
2.5.0

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

A message that is not in the archive (sent off-list or not yet received): 1491999205-16286-2-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org

Reviewed-by
#4 lore raw

Re: [PATCH 2/2] drm/amdgpu: drop support for per ASIC read registers

Quoted 5 lines · Christian König

From: Christian König <[email protected]>

Only per family registers are still used.

Series is:

Quoted 119 lines
---
 drivers/gpu/drm/amd/amdgpu/soc15.c | 29 +-------------------------
 drivers/gpu/drm/amd/amdgpu/vi.c    | 42 +-------------------------------------
 2 files changed, 2 insertions(+), 69 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +1 -28
index 8917bde..2c05dab 100644
@@ -280,10 +280,6 @@ static bool soc15_read_bios_from_rom(struct amdgpu_device *adev,
        return true;
 }
 
-static struct amdgpu_allowed_register_entry vega10_allowed_read_registers[] = {
-       /* todo */
-};
-
 static struct amdgpu_allowed_register_entry soc15_allowed_read_registers[] = {
        { SOC15_REG_OFFSET(GC, 0, mmGRBM_STATUS)},
        { SOC15_REG_OFFSET(GC, 0, mmGRBM_STATUS2)},
@@ -341,32 +337,9 @@ static uint32_t soc15_get_register_value(struct amdgpu_device *adev,
 static int soc15_read_register(struct amdgpu_device *adev, u32 se_num,
                            u32 sh_num, u32 reg_offset, u32 *value)
 {
-       struct amdgpu_allowed_register_entry *asic_register_table = NULL;
-       struct amdgpu_allowed_register_entry *asic_register_entry;
-       uint32_t size, i;
+       uint32_t i;
 
        *value = 0;
-       switch (adev->asic_type) {
-       case CHIP_VEGA10:
-               asic_register_table = vega10_allowed_read_registers;
-               size = ARRAY_SIZE(vega10_allowed_read_registers);
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       if (asic_register_table) {
-               for (i = 0; i < size; i++) {
-                       asic_register_entry = asic_register_table + i;
-                       if (reg_offset != asic_register_entry->reg_offset)
-                               continue;
-                       *value = soc15_get_register_value(adev,
-                                                         asic_register_entry->grbm_indexed,
-                                                         se_num, sh_num, reg_offset);
-                       return 0;
-               }
-       }
-
        for (i = 0; i < ARRAY_SIZE(soc15_allowed_read_registers); i++) {
                if (reg_offset != soc15_allowed_read_registers[i].reg_offset)
                        continue;
drivers/gpu/drm/amd/amdgpu/vi.c +1 -42
index 5be8e94..505c17a 100644
@@ -464,12 +464,6 @@ static void vi_detect_hw_virtualization(struct amdgpu_device *adev)
        }
 }
 
-static const struct amdgpu_allowed_register_entry tonga_allowed_read_registers[] = {
-};
-
-static const struct amdgpu_allowed_register_entry cz_allowed_read_registers[] = {
-};
-
 static const struct amdgpu_allowed_register_entry vi_allowed_read_registers[] = {
        {mmGRBM_STATUS},
        {mmGRBM_STATUS2},
@@ -648,43 +642,9 @@ static uint32_t vi_get_register_value(struct amdgpu_device *adev,
 static int vi_read_register(struct amdgpu_device *adev, u32 se_num,
                            u32 sh_num, u32 reg_offset, u32 *value)
 {
-       const struct amdgpu_allowed_register_entry *asic_register_table = NULL;
-       const struct amdgpu_allowed_register_entry *asic_register_entry;
-       uint32_t size, i;
+       uint32_t i;
 
        *value = 0;
-       switch (adev->asic_type) {
-       case CHIP_TOPAZ:
-               asic_register_table = tonga_allowed_read_registers;
-               size = ARRAY_SIZE(tonga_allowed_read_registers);
-               break;
-       case CHIP_FIJI:
-       case CHIP_TONGA:
-       case CHIP_POLARIS11:
-       case CHIP_POLARIS10:
-       case CHIP_POLARIS12:
-       case CHIP_CARRIZO:
-       case CHIP_STONEY:
-               asic_register_table = cz_allowed_read_registers;
-               size = ARRAY_SIZE(cz_allowed_read_registers);
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       if (asic_register_table) {
-               for (i = 0; i < size; i++) {
-                       bool indexed = asic_register_entry->grbm_indexed;
-
-                       asic_register_entry = asic_register_table + i;
-                       if (reg_offset != asic_register_entry->reg_offset)
-                               continue;
-                       *value = vi_get_register_value(adev, indexed, se_num,
-                                                      sh_num, reg_offset);
-                       return 0;
-               }
-       }
-
        for (i = 0; i < ARRAY_SIZE(vi_allowed_read_registers); i++) {
                bool indexed = vi_allowed_read_registers[i].grbm_indexed;
 
--

2.5.0

Quoted 4 lines

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

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