[PATCH umr 1/2] Fix UVD/VCN IB detection.

[PATCH umr 1/2] Fix UVD/VCN IB detection.

[Tom St Denis]

Since we add the IP name to the register names we
need to strip that off again.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 src/lib/ring_decode.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/lib/ring_decode.c b/src/lib/ring_decode.c
index 9d6e366e4594..52855ab4fb62 100644
--- a/src/lib/ring_decode.c
+++ b/src/lib/ring_decode.c
@@ -748,6 +748,10 @@ static void print_decode_pm4(struct umr_asic *asic, struct umr_ring_decoder *dec
 			name = umr_reg_name(asic, decoder->pm4.next_write_mem.addr_lo);
 			printf("   word (%lu): %s(0x%lx) <= 0x%lx", (unsigned long)decoder->pm4.cur_word++, name, (unsigned long)decoder->pm4.next_write_mem.addr_lo, (unsigned long)ib);
 
+			// strip off IP name
+			name = strstr(name, ".");
+			if (name[0] == '.') ++name;
+
 			// detect VCN/UVD IBs and chain them once all
 			// 4 pieces of information are found
 			if (!strcmp(name, "mmUVD_LMI_RBC_IB_VMID")) {
-- 
2.12.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH umr 2/2] Add SI/CIK to read_vram.

[Tom St Denis]

Tested with my Tahiti device.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 src/lib/read_vram.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/read_vram.c b/src/lib/read_vram.c
index f2c3a15c27fe..c254f5a2e406 100644
--- a/src/lib/read_vram.c
+++ b/src/lib/read_vram.c
@@ -815,6 +815,8 @@ int umr_read_vram(struct umr_asic *asic, uint32_t vmid, uint64_t address, uint32
 	}
 
 	switch (asic->family) {
+		case FAMILY_SI:
+		case FAMILY_CIK:
 		case FAMILY_VI:
 			return umr_read_vram_vi(asic, vmid, address, size, dst);
 		case FAMILY_RV:
-- 
2.12.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH umr 2/2] Add SI/CIK to read_vram.

[Deucher, Alexander]

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf
> Of Tom St Denis
> Sent: Friday, August 25, 2017 8:56 AM
> To: amd-gfx@lists.freedesktop.org
> Cc: StDenis, Tom
> Subject: [PATCH umr 2/2] Add SI/CIK to read_vram.
> 
> Tested with my Tahiti device.
> 
> Signed-off-by: Tom St Denis <tom.stdenis@amd.com>

Series is:
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  src/lib/read_vram.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/src/lib/read_vram.c b/src/lib/read_vram.c
> index f2c3a15c27fe..c254f5a2e406 100644
> --- a/src/lib/read_vram.c
> +++ b/src/lib/read_vram.c
> @@ -815,6 +815,8 @@ int umr_read_vram(struct umr_asic *asic, uint32_t
> vmid, uint64_t address, uint32
>  	}
> 
>  	switch (asic->family) {
> +		case FAMILY_SI:
> +		case FAMILY_CIK:
>  		case FAMILY_VI:
>  			return umr_read_vram_vi(asic, vmid, address, size,
> dst);
>  		case FAMILY_RV:
> --
> 2.12.0
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx