drm/amdgpu:use FRAME_CNTL for new GFX ucode
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): 1493894828-7370-1-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org
PATCH 1/2 drm/amdgpu:use FRAME_CNTL for new GFX ucode
-----Original Message-----
From: Monk Liu [mailto:[email protected]]
Sent: Thursday, May 04, 2017 6:47 PM
To: Liu, Monk <[email protected]>
Cc: Liu, Monk <[email protected]>
Subject: [PATCH 1/2] drm/amdgpu:use FRAME_CNTL for new GFX ucode
VI/AI affected:
CP/HW team requires KMD insert FRAME_CONTROL(end) after the last IB and before the fence of this DMAframe.
this is to make sure the cache are flushed, and it's a must change no matter MCBP/SR-IOV or bare-metal case because new CP hw won't do the cache flush for each IB anymore, it just leaves it to KMD now.
with this patch, certain MCBP hang issue when rendering vulkan/chained-ib are resolved.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 7 +++++++ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 +++++++ 5 files changed, 19 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -1828,6 +1828,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) #define amdgpu_ring_emit_cntxcntl(r, d) (r)->funcs->emit_cntxcntl((r), (d)) #define amdgpu_ring_emit_rreg(r, d) (r)->funcs->emit_rreg((r), (d)) #define amdgpu_ring_emit_wreg(r, d, v) (r)->funcs->emit_wreg((r), (d), (v)) +#define amdgpu_ring_emit_tmz (r, b) (r)->funcs->emit_tmz((r), (b))#define amdgpu_ring_pad_ib (r, ib) ((r)->funcs->pad_ib((r), (ib))) #define amdgpu_ring_init_cond_exec(r) (r)->funcs->init_cond_exec((r)) #define amdgpu_ring_patch_cond_exec(r,o) (r)->funcs->patch_cond_exec((r),(o))
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +3 -0
@@ -206,6 +206,9 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, need_ctx_switch = false; } +if (ring->funcs->emit_tmz) +amdgpu_ring_emit_tmz (ring, false); + if (ring->funcs->emit_hdp_invalidate#ifdef CONFIG_X86_64 && !(adev->flags &AMD_IS_APU )
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +1 -0
@@ -142,6 +142,7 @@ struct amdgpu_ring_funcs {void (*emit_cntxcntl) (struct amdgpu_ring *ring,uint32_t flags);void (*emit_rreg)(struct amdgpu_ring *ring,uint32_t reg);void (*emit_wreg)(struct amdgpu_ring *ring,uint32_t reg,uint32_t val); +void (*emit_tmz)(struct amdgpu_ring *ring,bool start); };struct amdgpu_ring {
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +5 -0
@@ -6665,6 +6665,12 @@ static void gfx_v8_0_ring_emit_patch_cond_exec(struct amdgpu_ring *ring, unsigne ring->ring[offset] = (ring->ring_size >>2 ) - offset + cur; } +static void gfx_v8_0_ring_emit_tmz (struct amdgpu_ring *ring,bool +start) { +amdgpu_ring_write (ring,PACKET3 (PACKET3_FRAME_CONTROL ,0 )); +amdgpu_ring_write (ring,FRAME_CMD (start ?0 :1 ));/* frame_end */ } + static void gfx_v8_0_ring_emit_rreg(struct amdgpu_ring *ring, uint32_t reg) { @@ -6946,6 +6952,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = { .emit_cntxcntl = gfx_v8_ring_emit_cntxcntl, .init_cond_exec = gfx_v8_0_ring_emit_init_cond_exec,
.patch_cond_exec = gfx_v8_0_ring_emit_patch_cond_exec,
+ .emit_tmz = gfx_v8_0_ring_emit_tmz,
};
static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute = { diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 3bf7992..a9ca891 100644
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +5 -0
@@ -3245,6 +3245,12 @@ static void gfx_v9_0_ring_emit_patch_cond_exec(struct amdgpu_ring *ring, unsigne ring->ring[offset] = (ring->ring_size>>2 ) - offset + cur; } +static void gfx_v9_0_ring_emit_tmz (struct amdgpu_ring *ring,bool +start) { +amdgpu_ring_write (ring,PACKET3 (PACKET3_FRAME_CONTROL ,0 )); +amdgpu_ring_write (ring,FRAME_CMD (start ?0 :1 ));/* frame_end */ } +static void gfx_v9_0_ring_emit_rreg (struct amdgpu_ring *ring,uint32_t reg) { struct amdgpu_device *adev = ring->adev; @@ -3579,6 +3585,7 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_gfx = { .emit_cntxcntl = gfx_v9_ring_emit_cntxcntl, .init_cond_exec = gfx_v9_0_ring_emit_init_cond_exec,
.patch_cond_exec = gfx_v9_0_ring_emit_patch_cond_exec,
+ .emit_tmz = gfx_v9_0_ring_emit_tmz,
};
static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_compute = {
--
2.7.4
_______________________________________________
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): DM5PR12MB1610C585C399ACCE714DB19484EA0-2J9CzHegvk++jCVTvoAFKAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Quoted 10 lines · Monk
-----Original Message-----
From: Monk Liu [mailto:[email protected]]
Sent: Thursday, May 04, 2017 6:47 PM
To: Liu, Monk <[email protected]>
Cc: Liu, Monk <[email protected]>
Subject: [PATCH 1/2] drm/amdgpu:useFRAME_CNTLfor new GFX ucodeVI/AI affected:
I thought this was a gfx9-only change? If it's gfx8 also, we're going to have pretty bad compatibility issues when new firmware is used with old kernel...
Cheers,
Nicolai
Quoted 100 lines
CP/HW team requires KMD insert
FRAME_CONTROL(end)after the last IB and before the fence of this DMAframe.this is to make sure the cache are flushed, and it's a must change no matter MCBP/SR-IOV or bare-metal case because new CP hw won't do the cache flush for each IB anymore, it just leaves it to KMD now.
with this patch, certain MCBP hang issue when rendering vulkan/chained-ib are resolved.
Change-Id I34ee7528aa32e704b2850bc6d50774b24c29b840Signed-off-by Monk Liu <[email protected]>Reviewed-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 7 +++++++ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 +++++++ 5 files changed, 19 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-0@@ -1828,6 +1828,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) #define amdgpu_ring_emit_cntxcntl(r, d) (r)->funcs->emit_cntxcntl((r), (d)) #define amdgpu_ring_emit_rreg(r, d) (r)->funcs->emit_rreg((r), (d)) #define amdgpu_ring_emit_wreg(r, d, v) (r)->funcs->emit_wreg((r), (d), (v)) +#define amdgpu_ring_emit_tmz (r, b) (r)->funcs->emit_tmz((r), (b))#define amdgpu_ring_pad_ib (r, ib) ((r)->funcs->pad_ib((r), (ib))) #define amdgpu_ring_init_cond_exec(r) (r)->funcs->init_cond_exec((r)) #define amdgpu_ring_patch_cond_exec(r,o) (r)->funcs->patch_cond_exec((r),(o))drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +3
-0@@ -206,6 +206,9 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, need_ctx_switch = false; } +if (ring->funcs->emit_tmz) +amdgpu_ring_emit_tmz (ring, false); + if (ring->funcs->emit_hdp_invalidate#ifdef CONFIG_X86_64 && !(adev->flags &AMD_IS_APU )drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +1
-0@@ -142,6 +142,7 @@ struct amdgpu_ring_funcs {void (*emit_cntxcntl) (struct amdgpu_ring *ring,uint32_t flags);void (*emit_rreg)(struct amdgpu_ring *ring,uint32_t reg);void (*emit_wreg)(struct amdgpu_ring *ring,uint32_t reg,uint32_t val); +void (*emit_tmz)(struct amdgpu_ring *ring,bool start); };struct amdgpu_ring {drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +6
-0@@ -6665,6 +6665,12 @@ static void gfx_v8_0_ring_emit_patch_cond_exec(struct amdgpu_ring *ring, unsigne ring->ring[offset] = (ring->ring_size >>2 ) - offset + cur; } +static void gfx_v8_0_ring_emit_tmz (struct amdgpu_ring *ring,bool +start) { +amdgpu_ring_write (ring,PACKET3 (PACKET3_FRAME_CONTROL ,0 )); +amdgpu_ring_write (ring,FRAME_CMD (start ?0 :1 ));/* frame_end */ } + static void gfx_v8_0_ring_emit_rreg(struct amdgpu_ring *ring, uint32_t reg) { @@ -6946,6 +6952,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = { .emit_cntxcntl = gfx_v8_ring_emit_cntxcntl, .init_cond_exec = gfx_v8_0_ring_emit_init_cond_exec, .patch_cond_exec = gfx_v8_0_ring_emit_patch_cond_exec, + .emit_tmz = gfx_v8_0_ring_emit_tmz, }; static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute = { diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.cindex 3bf7992..a9ca891 100644
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +6
-1@@ -3245,6 +3245,12 @@ static void gfx_v9_0_ring_emit_patch_cond_exec(struct amdgpu_ring *ring, unsigne ring->ring[offset] = (ring->ring_size>>2 ) - offset + cur; } +static void gfx_v9_0_ring_emit_tmz (struct amdgpu_ring *ring,bool +start) { +amdgpu_ring_write (ring,PACKET3 (PACKET3_FRAME_CONTROL ,0 )); +amdgpu_ring_write (ring,FRAME_CMD (start ?0 :1 ));/* frame_end */ } +static void gfx_v9_0_ring_emit_rreg (struct amdgpu_ring *ring,uint32_t reg) { struct amdgpu_device *adev = ring->adev; @@ -3579,6 +3585,7 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_gfx = { .emit_cntxcntl = gfx_v9_ring_emit_cntxcntl, .init_cond_exec = gfx_v9_0_ring_emit_init_cond_exec, .patch_cond_exec = gfx_v9_0_ring_emit_patch_cond_exec, + .emit_tmz = gfx_v9_0_ring_emit_tmz, };static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_compute = { --2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Signature · 6 lines
Lerne, wie die Welt wirklich ist, Aber vergiss niemals, wie sie sein sollte. _______________________________________________ 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): 07fefa31-2e08-f32a-1770-53f6076b6dbb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
No, this CP side change is from VI, and ported to AI
-----Original Message-----
From: Nicolai Hähnle [mailto:[email protected]]
Sent: Thursday, May 04, 2017 7:33 PM
To: Liu, Monk <[email protected]>; [email protected]
Subject: Re: FW: [PATCH 1/2] drm/amdgpu:use FRAME_CNTL for new GFX ucode
Quoted 10 lines · Monk
-----Original Message-----
From: Monk Liu [mailto:[email protected]]
Sent: Thursday, May 04, 2017 6:47 PM
To: Liu, Monk <[email protected]>
Cc: Liu, Monk <[email protected]>
Subject: [PATCH 1/2] drm/amdgpu:useFRAME_CNTLfor new GFX ucodeVI/AI affected:
I thought this was a gfx9-only change? If it's gfx8 also, we're going to have pretty bad compatibility issues when new firmware is used with old kernel...
Cheers,
Nicolai
Quoted 108 lines
CP/HW team requires KMD insert
FRAME_CONTROL(end)after the last IB and before the fence of this DMAframe.this is to make sure the cache are flushed, and it's a must change no matter MCBP/SR-IOV or bare-metal case because new CP hw won't do the cache flush for each IB anymore, it just leaves it to KMD now.
with this patch, certain MCBP hang issue when rendering vulkan/chained-ib are resolved.
Change-Id I34ee7528aa32e704b2850bc6d50774b24c29b840Signed-off-by Monk Liu <[email protected]>Reviewed-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 7 +++++++ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 +++++++ 5 files changed, 19 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-0@@ -1828,6 +1828,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) #define amdgpu_ring_emit_cntxcntl(r, d) (r)->funcs->emit_cntxcntl((r), (d)) #define amdgpu_ring_emit_rreg(r, d) (r)->funcs->emit_rreg((r), (d)) #define amdgpu_ring_emit_wreg(r, d, v) (r)->funcs->emit_wreg((r), (d), (v)) +#define amdgpu_ring_emit_tmz (r, b) (r)->funcs->emit_tmz((r), (b))#define amdgpu_ring_pad_ib (r, ib) ((r)->funcs->pad_ib((r), (ib)))#define amdgpu_ring_init_cond_exec (r) (r)->funcs->init_cond_exec((r))#define
amdgpu_ring_patch_cond_exec(r,o)
(r)->funcs->patch_cond_exec((r),(o))drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +3
-0@@ -206,6 +206,9 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, need_ctx_switch = false; } +if (ring->funcs->emit_tmz) +amdgpu_ring_emit_tmz (ring, false); + if (ring->funcs->emit_hdp_invalidate #ifdef CONFIG_X86_64 && !(adev->flags &AMD_IS_APU )drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +1
-0@@ -142,6 +142,7 @@ struct amdgpu_ring_funcs {void (*emit_cntxcntl) (struct amdgpu_ring *ring,uint32_t flags);void (*emit_rreg)(struct amdgpu_ring *ring,uint32_t reg);void (*emit_wreg)(struct amdgpu_ring *ring,uint32_t reg,uint32_t val); +void (*emit_tmz)(struct amdgpu_ring *ring,bool start); };struct
amdgpu_ring{drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +6
-0@@ -6665,6 +6665,12 @@ static void gfx_v8_0_ring_emit_patch_cond_exec(struct amdgpu_ring *ring, unsigne ring->ring[offset] = (ring->ring_size >>2 ) - offset + cur; } +static void gfx_v8_0_ring_emit_tmz (struct amdgpu_ring *ring,bool +start) { +amdgpu_ring_write (ring,PACKET3 (PACKET3_FRAME_CONTROL ,0 )); +amdgpu_ring_write (ring,FRAME_CMD (start ?0 :1 ));/* frame_end */ } + static void gfx_v8_0_ring_emit_rreg(struct amdgpu_ring *ring, uint32_t reg) { @@ -6946,6 +6952,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = { .emit_cntxcntl = gfx_v8_ring_emit_cntxcntl, .init_cond_exec = gfx_v8_0_ring_emit_init_cond_exec, .patch_cond_exec = gfx_v8_0_ring_emit_patch_cond_exec, + .emit_tmz = gfx_v8_0_ring_emit_tmz, };static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute = {drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +6
-1@@ -3245,6 +3245,12 @@ static void gfx_v9_0_ring_emit_patch_cond_exec(struct amdgpu_ring *ring, unsigne ring->ring[offset] = (ring->ring_size>>2 ) - offset + cur; } +static void gfx_v9_0_ring_emit_tmz (struct amdgpu_ring *ring,bool +start) { +amdgpu_ring_write (ring,PACKET3 (PACKET3_FRAME_CONTROL ,0 )); +amdgpu_ring_write (ring,FRAME_CMD (start ?0 :1 ));/* frame_end */ } +static void gfx_v9_0_ring_emit_rreg (struct amdgpu_ring *ring,uint32_t reg) { struct amdgpu_device *adev = ring->adev; @@ -3579,6 +3585,7 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_gfx = { .emit_cntxcntl = gfx_v9_ring_emit_cntxcntl, .init_cond_exec = gfx_v9_0_ring_emit_init_cond_exec, .patch_cond_exec = gfx_v9_0_ring_emit_patch_cond_exec, + .emit_tmz = gfx_v9_0_ring_emit_tmz, };static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_compute = { --2.7.4
Quoted 5 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
--
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
And for VI, even user use the old firmware, it is still safe to use TMZ package,
But I will double check with CP team today, thanks for your remind
BR Monk
-----Original Message-----
From: Liu, Monk
Sent: Thursday, May 04, 2017 7:42 PM
To: 'Nicolai Hähnle' <[email protected]>; [email protected]
Subject: RE: FW: [PATCH 1/2] drm/amdgpu:use FRAME_CNTL for new GFX ucode
No, this CP side change is from VI, and ported to AI
-----Original Message-----
From: Nicolai Hähnle [mailto:[email protected]]
Sent: Thursday, May 04, 2017 7:33 PM
To: Liu, Monk <[email protected]>; [email protected]
Subject: Re: FW: [PATCH 1/2] drm/amdgpu:use FRAME_CNTL for new GFX ucode
Quoted 10 lines · Monk
-----Original Message-----
From: Monk Liu [mailto:[email protected]]
Sent: Thursday, May 04, 2017 6:47 PM
To: Liu, Monk <[email protected]>
Cc: Liu, Monk <[email protected]>
Subject: [PATCH 1/2] drm/amdgpu:useFRAME_CNTLfor new GFX ucodeVI/AI affected:
I thought this was a gfx9-only change? If it's gfx8 also, we're going to have pretty bad compatibility issues when new firmware is used with old kernel...
Cheers,
Nicolai
Quoted 108 lines
CP/HW team requires KMD insert
FRAME_CONTROL(end)after the last IB and before the fence of this DMAframe.this is to make sure the cache are flushed, and it's a must change no matter MCBP/SR-IOV or bare-metal case because new CP hw won't do the cache flush for each IB anymore, it just leaves it to KMD now.
with this patch, certain MCBP hang issue when rendering vulkan/chained-ib are resolved.
Change-Id I34ee7528aa32e704b2850bc6d50774b24c29b840Signed-off-by Monk Liu <[email protected]>Reviewed-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 7 +++++++ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 +++++++ 5 files changed, 19 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-0@@ -1828,6 +1828,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) #define amdgpu_ring_emit_cntxcntl(r, d) (r)->funcs->emit_cntxcntl((r), (d)) #define amdgpu_ring_emit_rreg(r, d) (r)->funcs->emit_rreg((r), (d)) #define amdgpu_ring_emit_wreg(r, d, v) (r)->funcs->emit_wreg((r), (d), (v)) +#define amdgpu_ring_emit_tmz (r, b) (r)->funcs->emit_tmz((r), (b))#define amdgpu_ring_pad_ib (r, ib) ((r)->funcs->pad_ib((r), (ib)))#define amdgpu_ring_init_cond_exec (r) (r)->funcs->init_cond_exec((r))#define
amdgpu_ring_patch_cond_exec(r,o)
(r)->funcs->patch_cond_exec((r),(o))drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +3
-0@@ -206,6 +206,9 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, need_ctx_switch = false; } +if (ring->funcs->emit_tmz) +amdgpu_ring_emit_tmz (ring, false); + if (ring->funcs->emit_hdp_invalidate #ifdef CONFIG_X86_64 && !(adev->flags &AMD_IS_APU )drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +1
-0@@ -142,6 +142,7 @@ struct amdgpu_ring_funcs {void (*emit_cntxcntl) (struct amdgpu_ring *ring,uint32_t flags);void (*emit_rreg)(struct amdgpu_ring *ring,uint32_t reg);void (*emit_wreg)(struct amdgpu_ring *ring,uint32_t reg,uint32_t val); +void (*emit_tmz)(struct amdgpu_ring *ring,bool start); };struct
amdgpu_ring{drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +6
-0@@ -6665,6 +6665,12 @@ static void gfx_v8_0_ring_emit_patch_cond_exec(struct amdgpu_ring *ring, unsigne ring->ring[offset] = (ring->ring_size >>2 ) - offset + cur; } +static void gfx_v8_0_ring_emit_tmz (struct amdgpu_ring *ring,bool +start) { +amdgpu_ring_write (ring,PACKET3 (PACKET3_FRAME_CONTROL ,0 )); +amdgpu_ring_write (ring,FRAME_CMD (start ?0 :1 ));/* frame_end */ } + static void gfx_v8_0_ring_emit_rreg(struct amdgpu_ring *ring, uint32_t reg) { @@ -6946,6 +6952,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = { .emit_cntxcntl = gfx_v8_ring_emit_cntxcntl, .init_cond_exec = gfx_v8_0_ring_emit_init_cond_exec, .patch_cond_exec = gfx_v8_0_ring_emit_patch_cond_exec, + .emit_tmz = gfx_v8_0_ring_emit_tmz, };static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute = {drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +6
-1@@ -3245,6 +3245,12 @@ static void gfx_v9_0_ring_emit_patch_cond_exec(struct amdgpu_ring *ring, unsigne ring->ring[offset] = (ring->ring_size>>2 ) - offset + cur; } +static void gfx_v9_0_ring_emit_tmz (struct amdgpu_ring *ring,bool +start) { +amdgpu_ring_write (ring,PACKET3 (PACKET3_FRAME_CONTROL ,0 )); +amdgpu_ring_write (ring,FRAME_CMD (start ?0 :1 ));/* frame_end */ } +static void gfx_v9_0_ring_emit_rreg (struct amdgpu_ring *ring,uint32_t reg) { struct amdgpu_device *adev = ring->adev; @@ -3579,6 +3585,7 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_gfx = { .emit_cntxcntl = gfx_v9_ring_emit_cntxcntl, .init_cond_exec = gfx_v9_0_ring_emit_init_cond_exec, .patch_cond_exec = gfx_v9_0_ring_emit_patch_cond_exec, + .emit_tmz = gfx_v9_0_ring_emit_tmz, };static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_compute = { --2.7.4
Quoted 5 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
--
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.
_______________________________________________
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): DM5PR12MB1610F8220DB0CC2AFDCB989284EA0-2J9CzHegvk++jCVTvoAFKAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Quoted 3 lines · Monk
And for VI, even user use the old firmware, it is still safe to use TMZ package,
But I will double check with CP team today, thanks for your remind
Right, I'm sure that old firmware + your change is safe.
The question is: Is it safe to use the new firmware _without_ your change. If the answer is "no" for gfx8, we have a problem.
Cheers,
Nicolai
Quoted 155 lines
BR Monk
-----Original Message-----
From: Liu, Monk
Sent: Thursday, May 04, 2017 7:42 PM
To: 'Nicolai Hähnle' <[email protected]>; [email protected]
Subject: RE: FW: [PATCH 1/2] drm/amdgpu:useFRAME_CNTLfor new GFX ucodeNo, this CP side change is from VI, and ported to AI
-----Original Message-----
From: Nicolai Hähnle [mailto:[email protected]]
Sent: Thursday, May 04, 2017 7:33 PM
To: Liu, Monk <[email protected]>; [email protected]
Subject: Re: FW: [PATCH 1/2] drm/amdgpu:useFRAME_CNTLfor new GFX ucodeQuoted 10 lines · Monk
-----Original Message-----
From: Monk Liu [mailto:[email protected]]
Sent: Thursday, May 04, 2017 6:47 PM
To: Liu, Monk <[email protected]>
Cc: Liu, Monk <[email protected]>
Subject: [PATCH 1/2] drm/amdgpu:useFRAME_CNTLfor new GFX ucodeVI/AI affected:
I thought this was a gfx9-only change? If it's gfx8 also, we're going to have pretty bad compatibility issues when new firmware is used with old kernel...
Cheers,
NicolaiQuoted 108 lines
CP/HW team requires KMD insert
FRAME_CONTROL(end)after the last IB and before the fence of this DMAframe.this is to make sure the cache are flushed, and it's a must change no matter MCBP/SR-IOV or bare-metal case because new CP hw won't do the cache flush for each IB anymore, it just leaves it to KMD now.
with this patch, certain MCBP hang issue when rendering vulkan/chained-ib are resolved.
Change-Id I34ee7528aa32e704b2850bc6d50774b24c29b840Signed-off-by Monk Liu <[email protected]>Reviewed-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 7 +++++++ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 +++++++ 5 files changed, 19 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-0@@ -1828,6 +1828,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) #define amdgpu_ring_emit_cntxcntl(r, d) (r)->funcs->emit_cntxcntl((r), (d)) #define amdgpu_ring_emit_rreg(r, d) (r)->funcs->emit_rreg((r), (d)) #define amdgpu_ring_emit_wreg(r, d, v) (r)->funcs->emit_wreg((r), (d), (v)) +#define amdgpu_ring_emit_tmz(r, b) (r)->funcs->emit_tmz((r), (b)) #define amdgpu_ring_pad_ib(r, ib) ((r)->funcs->pad_ib((r), (ib))) #define amdgpu_ring_init_cond_exec(r) (r)->funcs->init_cond_exec((r))#define
amdgpu_ring_patch_cond_exec(r,o)
(r)->funcs->patch_cond_exec((r),(o))drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +3
-0@@ -206,6 +206,9 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, need_ctx_switch = false; } +if (ring->funcs->emit_tmz) +amdgpu_ring_emit_tmz (ring, false); + if (ring->funcs->emit_hdp_invalidate #ifdef CONFIG_X86_64 && !(adev->flags &AMD_IS_APU )drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +1
-0@@ -142,6 +142,7 @@ struct amdgpu_ring_funcs {void (*emit_cntxcntl) (struct amdgpu_ring *ring,uint32_t flags);void (*emit_rreg)(struct amdgpu_ring *ring,uint32_t reg);void (*emit_wreg)(struct amdgpu_ring *ring,uint32_t reg,uint32_t val); +void (*emit_tmz)(struct amdgpu_ring *ring,bool start); };struct
amdgpu_ring{drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +6
-0@@ -6665,6 +6665,12 @@ static void gfx_v8_0_ring_emit_patch_cond_exec(struct amdgpu_ring *ring, unsigne ring->ring[offset] = (ring->ring_size >>2 ) - offset + cur; } +static void gfx_v8_0_ring_emit_tmz (struct amdgpu_ring *ring,bool +start) { +amdgpu_ring_write (ring,PACKET3 (PACKET3_FRAME_CONTROL ,0 )); +amdgpu_ring_write (ring,FRAME_CMD (start ?0 :1 ));/* frame_end */ } + static void gfx_v8_0_ring_emit_rreg(struct amdgpu_ring *ring, uint32_t reg) { @@ -6946,6 +6952,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = { .emit_cntxcntl = gfx_v8_ring_emit_cntxcntl, .init_cond_exec = gfx_v8_0_ring_emit_init_cond_exec, .patch_cond_exec = gfx_v8_0_ring_emit_patch_cond_exec, + .emit_tmz = gfx_v8_0_ring_emit_tmz, };static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute = {drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +6
-1@@ -3245,6 +3245,12 @@ static void gfx_v9_0_ring_emit_patch_cond_exec(struct amdgpu_ring *ring, unsigne ring->ring[offset] = (ring->ring_size>>2 ) - offset + cur; } +static void gfx_v9_0_ring_emit_tmz (struct amdgpu_ring *ring,bool +start) { +amdgpu_ring_write (ring,PACKET3 (PACKET3_FRAME_CONTROL ,0 )); +amdgpu_ring_write (ring,FRAME_CMD (start ?0 :1 ));/* frame_end */ } +static void gfx_v9_0_ring_emit_rreg (struct amdgpu_ring *ring,uint32_t reg) { struct amdgpu_device *adev = ring->adev; @@ -3579,6 +3585,7 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_gfx = { .emit_cntxcntl = gfx_v9_ring_emit_cntxcntl, .init_cond_exec = gfx_v9_0_ring_emit_init_cond_exec, .patch_cond_exec = gfx_v9_0_ring_emit_patch_cond_exec, + .emit_tmz = gfx_v9_0_ring_emit_tmz, };static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_compute = { --2.7.4
Quoted 5 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx--
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.
Signature · 6 lines
Lerne, wie die Welt wirklich ist, Aber vergiss niemals, wie sie sein sollte. _______________________________________________ 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): a66cb2ea-1b5f-d85a-64e3-326b9e459955-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
I'll confirm it with HW today
-----Original Message-----
From: Nicolai Hähnle [mailto:[email protected]]
Sent: Thursday, May 04, 2017 7:47 PM
To: Liu, Monk <[email protected]>; [email protected]
Subject: Re: FW: [PATCH 1/2] drm/amdgpu:use FRAME_CNTL for new GFX ucode
Quoted 4 lines · Monk
And for VI, even user use the old firmware, it is still safe to use TMZ package,
But I will double check with CP team today, thanks for your remind
Right, I'm sure that old firmware + your change is safe.
The question is: Is it safe to use the new firmware _without_ your change. If the answer is "no" for gfx8, we have a problem.
Cheers,
Nicolai
Quoted 150 lines
BR Monk
-----Original Message-----
From: Liu, Monk
Sent: Thursday, May 04, 2017 7:42 PM
To: 'Nicolai Hähnle' <[email protected]>; [email protected]
Subject: RE: FW: [PATCH 1/2] drm/amdgpu:useFRAME_CNTLfor new GFX ucodeNo, this CP side change is from VI, and ported to AI
-----Original Message-----
From: Nicolai Hähnle [mailto:[email protected]]
Sent: Thursday, May 04, 2017 7:33 PM
To: Liu, Monk <[email protected]>; [email protected]
Subject: Re: FW: [PATCH 1/2] drm/amdgpu:useFRAME_CNTLfor new GFX ucodeQuoted 10 lines · Monk
-----Original Message-----
From: Monk Liu [mailto:[email protected]]
Sent: Thursday, May 04, 2017 6:47 PM
To: Liu, Monk <[email protected]>
Cc: Liu, Monk <[email protected]>
Subject: [PATCH 1/2] drm/amdgpu:useFRAME_CNTLfor new GFX ucodeVI/AI affected:
I thought this was a gfx9-only change? If it's gfx8 also, we're going to have pretty bad compatibility issues when new firmware is used with old kernel...
Cheers,
NicolaiQuoted 111 lines
CP/HW team requires KMD insert
FRAME_CONTROL(end)after the last IB and before the fence of this DMAframe.this is to make sure the cache are flushed, and it's a must change no matter MCBP/SR-IOV or bare-metal case because new CP hw won't do the cache flush for each IB anymore, it just leaves it to KMD now.
with this patch, certain MCBP hang issue when rendering vulkan/chained-ib are resolved.
Change-Id I34ee7528aa32e704b2850bc6d50774b24c29b840Signed-off-by Monk Liu <[email protected]>Reviewed-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 7 +++++++ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 +++++++ 5 files changed, 19 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-0@@ -1828,6 +1828,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) #define amdgpu_ring_emit_cntxcntl(r, d) (r)->funcs->emit_cntxcntl((r), (d)) #define amdgpu_ring_emit_rreg(r, d) (r)->funcs->emit_rreg((r), (d)) #define amdgpu_ring_emit_wreg(r, d, v) (r)->funcs->emit_wreg((r), (d), (v)) +#define amdgpu_ring_emit_tmz (r, b) (r)->funcs->emit_tmz((r), (b))#define amdgpu_ring_pad_ib (r, ib) ((r)->funcs->pad_ib((r), (ib)))#define amdgpu_ring_init_cond_exec (r) (r)->funcs->init_cond_exec((r))#define
amdgpu_ring_patch_cond_exec(r,o)
(r)->funcs->patch_cond_exec((r),(o))drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +3
-0@@ -206,6 +206,9 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, need_ctx_switch = false; } +if (ring->funcs->emit_tmz) +amdgpu_ring_emit_tmz (ring, false); + if (ring->funcs->emit_hdp_invalidate #ifdef CONFIG_X86_64 && !(adev->flags &AMD_IS_APU )drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +1
-0@@ -142,6 +142,7 @@ struct amdgpu_ring_funcs {void (*emit_cntxcntl) (struct amdgpu_ring *ring,uint32_t flags);void (*emit_rreg)(struct amdgpu_ring *ring,uint32_t reg);void (*emit_wreg)(struct amdgpu_ring *ring,uint32_t reg,uint32_t val); +void (*emit_tmz)(struct amdgpu_ring *ring,bool start); };struct
amdgpu_ring{drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +6
-0@@ -6665,6 +6665,12 @@ static void gfx_v8_0_ring_emit_patch_cond_exec(struct amdgpu_ring *ring, unsigne ring->ring[offset] = (ring->ring_size >>2 ) - offset + cur; } +static void gfx_v8_0_ring_emit_tmz (struct amdgpu_ring *ring,bool +start) { +amdgpu_ring_write (ring,PACKET3 (PACKET3_FRAME_CONTROL ,0 )); +amdgpu_ring_write (ring,FRAME_CMD (start ?0 :1 ));/* frame_end */ +} + static void gfx_v8_0_ring_emit_rreg(struct amdgpu_ring *ring, uint32_t reg) { @@ -6946,6 +6952,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = { .emit_cntxcntl = gfx_v8_ring_emit_cntxcntl, .init_cond_exec = gfx_v8_0_ring_emit_init_cond_exec,drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +1
-0.patch_cond_exec = gfx_v8_0_ring_emit_patch_cond_exec, + .emit_tmz = gfx_v8_0_ring_emit_tmz, }; static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute ={ diff --git
a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.cb/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.cindex 3bf7992..a9ca891 100644drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +6
-0@@ -3245,6 +3245,12 @@ static void gfx_v9_0_ring_emit_patch_cond_exec(struct amdgpu_ring *ring, unsigne ring->ring[offset] = (ring->ring_size>>2 ) - offset + cur; } +static void gfx_v9_0_ring_emit_tmz (struct amdgpu_ring *ring,bool +start) { +amdgpu_ring_write (ring,PACKET3 (PACKET3_FRAME_CONTROL ,0 )); +amdgpu_ring_write (ring,FRAME_CMD (start ?0 :1 ));/* frame_end */ +} +static void gfx_v9_0_ring_emit_rreg (struct amdgpu_ring *ring,uint32_t reg) { struct amdgpu_device *adev = ring->adev; @@ -3579,6 +3585,7 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_gfx = { .emit_cntxcntl = gfx_v9_ring_emit_cntxcntl, .init_cond_exec = gfx_v9_0_ring_emit_init_cond_exec,drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +1
-0.patch_cond_exec = gfx_v9_0_ring_emit_patch_cond_exec, + .emit_tmz = gfx_v9_0_ring_emit_tmz, }; static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_compute ={
--
2.7.4
Quoted 11 lines
Quoted 5 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx--
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.
--
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Zhou, David(ChunMing)
Reviewed-by Christian KönigHow about compute ring? Is there same requirement?
David
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Liu, Monk
Sent: Thursday, May 04, 2017 6:49 PM
To: [email protected]
Subject: FW: [PATCH 1/2] drm/amdgpu:use FRAME_CNTL for new GFX ucode
-----Original Message-----
From: Monk Liu [mailto:[email protected]]
Sent: Thursday, May 04, 2017 6:47 PM
To: Liu, Monk <[email protected]>
Cc: Liu, Monk <[email protected]>
Subject: [PATCH 1/2] drm/amdgpu:use FRAME_CNTL for new GFX ucode
VI/AI affected:
CP/HW team requires KMD insert FRAME_CONTROL(end) after the last IB and before the fence of this DMAframe.
this is to make sure the cache are flushed, and it's a must change no matter MCBP/SR-IOV or bare-metal case because new CP hw won't do the cache flush for each IB anymore, it just leaves it to KMD now.
with this patch, certain MCBP hang issue when rendering vulkan/chained-ib are resolved.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 7 +++++++ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 +++++++ 5 files changed, 19 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -1828,6 +1828,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) #define amdgpu_ring_emit_cntxcntl(r, d) (r)->funcs->emit_cntxcntl((r), (d)) #define amdgpu_ring_emit_rreg(r, d) (r)->funcs->emit_rreg((r), (d)) #define amdgpu_ring_emit_wreg(r, d, v) (r)->funcs->emit_wreg((r), (d), (v)) +#define amdgpu_ring_emit_tmz (r, b) (r)->funcs->emit_tmz((r), (b))#define amdgpu_ring_pad_ib (r, ib) ((r)->funcs->pad_ib((r), (ib))) #define amdgpu_ring_init_cond_exec(r) (r)->funcs->init_cond_exec((r)) #define amdgpu_ring_patch_cond_exec(r,o) (r)->funcs->patch_cond_exec((r),(o))
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +3 -0
@@ -206,6 +206,9 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, need_ctx_switch = false; } +if (ring->funcs->emit_tmz) +amdgpu_ring_emit_tmz (ring, false); + if (ring->funcs->emit_hdp_invalidate#ifdef CONFIG_X86_64 && !(adev->flags &AMD_IS_APU )
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +1 -0
@@ -142,6 +142,7 @@ struct amdgpu_ring_funcs {void (*emit_cntxcntl) (struct amdgpu_ring *ring,uint32_t flags);void (*emit_rreg)(struct amdgpu_ring *ring,uint32_t reg);void (*emit_wreg)(struct amdgpu_ring *ring,uint32_t reg,uint32_t val); +void (*emit_tmz)(struct amdgpu_ring *ring,bool start); };struct amdgpu_ring {
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +5 -0
@@ -6665,6 +6665,12 @@ static void gfx_v8_0_ring_emit_patch_cond_exec(struct amdgpu_ring *ring, unsigne ring->ring[offset] = (ring->ring_size >>2 ) - offset + cur; } +static void gfx_v8_0_ring_emit_tmz (struct amdgpu_ring *ring,bool +start) { +amdgpu_ring_write (ring,PACKET3 (PACKET3_FRAME_CONTROL ,0 )); +amdgpu_ring_write (ring,FRAME_CMD (start ?0 :1 ));/* frame_end */ } + static void gfx_v8_0_ring_emit_rreg(struct amdgpu_ring *ring, uint32_t reg) { @@ -6946,6 +6952,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = { .emit_cntxcntl = gfx_v8_ring_emit_cntxcntl, .init_cond_exec = gfx_v8_0_ring_emit_init_cond_exec,
.patch_cond_exec = gfx_v8_0_ring_emit_patch_cond_exec,
+ .emit_tmz = gfx_v8_0_ring_emit_tmz,
};
static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute = { diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 3bf7992..a9ca891 100644
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +5 -0
@@ -3245,6 +3245,12 @@ static void gfx_v9_0_ring_emit_patch_cond_exec(struct amdgpu_ring *ring, unsigne ring->ring[offset] = (ring->ring_size>>2 ) - offset + cur; } +static void gfx_v9_0_ring_emit_tmz (struct amdgpu_ring *ring,bool +start) { +amdgpu_ring_write (ring,PACKET3 (PACKET3_FRAME_CONTROL ,0 )); +amdgpu_ring_write (ring,FRAME_CMD (start ?0 :1 ));/* frame_end */ } +static void gfx_v9_0_ring_emit_rreg (struct amdgpu_ring *ring,uint32_t reg) { struct amdgpu_device *adev = ring->adev; @@ -3579,6 +3585,7 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_gfx = { .emit_cntxcntl = gfx_v9_ring_emit_cntxcntl, .init_cond_exec = gfx_v9_0_ring_emit_init_cond_exec,
.patch_cond_exec = gfx_v9_0_ring_emit_patch_cond_exec,
+ .emit_tmz = gfx_v9_0_ring_emit_tmz,
};
static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_compute = {
--
2.7.4
_______________________________________________
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
A message that is not in the archive (sent off-list or not yet received): MWHPR1201MB0206FC2E5315E6332599BDECB4EB0-3iK1xFAIwjrUF/YbdlDdgWrFom/aUZj6nBOFsp37pqbUKgpGm//BTAC/[email protected]
Liu, Monk
Reviewed-by Christian KönigNo, only GFX ring
-----Original Message-----
From: Zhou, David(ChunMing)
Sent: Friday, May 5, 2017 10:03 AM
To: Liu, Monk <[email protected]>; [email protected]
Subject: RE: [PATCH 1/2] drm/amdgpu:use FRAME_CNTL for new GFX ucode
How about compute ring? Is there same requirement?
David
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Liu, Monk
Sent: Thursday, May 04, 2017 6:49 PM
To: [email protected]
Subject: FW: [PATCH 1/2] drm/amdgpu:use FRAME_CNTL for new GFX ucode
-----Original Message-----
From: Monk Liu [mailto:[email protected]]
Sent: Thursday, May 04, 2017 6:47 PM
To: Liu, Monk <[email protected]>
Cc: Liu, Monk <[email protected]>
Subject: [PATCH 1/2] drm/amdgpu:use FRAME_CNTL for new GFX ucode
VI/AI affected:
CP/HW team requires KMD insert FRAME_CONTROL(end) after the last IB and before the fence of this DMAframe.
this is to make sure the cache are flushed, and it's a must change no matter MCBP/SR-IOV or bare-metal case because new CP hw won't do the cache flush for each IB anymore, it just leaves it to KMD now.
with this patch, certain MCBP hang issue when rendering vulkan/chained-ib are resolved.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 7 +++++++ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 +++++++ 5 files changed, 19 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -1828,6 +1828,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) #define amdgpu_ring_emit_cntxcntl(r, d) (r)->funcs->emit_cntxcntl((r), (d)) #define amdgpu_ring_emit_rreg(r, d) (r)->funcs->emit_rreg((r), (d)) #define amdgpu_ring_emit_wreg(r, d, v) (r)->funcs->emit_wreg((r), (d), (v)) +#define amdgpu_ring_emit_tmz (r, b) (r)->funcs->emit_tmz((r), (b))#define amdgpu_ring_pad_ib (r, ib) ((r)->funcs->pad_ib((r), (ib))) #define amdgpu_ring_init_cond_exec(r) (r)->funcs->init_cond_exec((r)) #define amdgpu_ring_patch_cond_exec(r,o) (r)->funcs->patch_cond_exec((r),(o))
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +3 -0
@@ -206,6 +206,9 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, need_ctx_switch = false; } +if (ring->funcs->emit_tmz) +amdgpu_ring_emit_tmz (ring, false); + if (ring->funcs->emit_hdp_invalidate#ifdef CONFIG_X86_64 && !(adev->flags &AMD_IS_APU )
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +1 -0
@@ -142,6 +142,7 @@ struct amdgpu_ring_funcs {void (*emit_cntxcntl) (struct amdgpu_ring *ring,uint32_t flags);void (*emit_rreg)(struct amdgpu_ring *ring,uint32_t reg);void (*emit_wreg)(struct amdgpu_ring *ring,uint32_t reg,uint32_t val); +void (*emit_tmz)(struct amdgpu_ring *ring,bool start); };struct amdgpu_ring {
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +5 -0
@@ -6665,6 +6665,12 @@ static void gfx_v8_0_ring_emit_patch_cond_exec(struct amdgpu_ring *ring, unsigne ring->ring[offset] = (ring->ring_size >>2 ) - offset + cur; } +static void gfx_v8_0_ring_emit_tmz (struct amdgpu_ring *ring,bool +start) { +amdgpu_ring_write (ring,PACKET3 (PACKET3_FRAME_CONTROL ,0 )); +amdgpu_ring_write (ring,FRAME_CMD (start ?0 :1 ));/* frame_end */ } + static void gfx_v8_0_ring_emit_rreg(struct amdgpu_ring *ring, uint32_t reg) { @@ -6946,6 +6952,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = { .emit_cntxcntl = gfx_v8_ring_emit_cntxcntl, .init_cond_exec = gfx_v8_0_ring_emit_init_cond_exec,
.patch_cond_exec = gfx_v8_0_ring_emit_patch_cond_exec,
+ .emit_tmz = gfx_v8_0_ring_emit_tmz,
};
static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute = { diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 3bf7992..a9ca891 100644
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +5 -0
@@ -3245,6 +3245,12 @@ static void gfx_v9_0_ring_emit_patch_cond_exec(struct amdgpu_ring *ring, unsigne ring->ring[offset] = (ring->ring_size>>2 ) - offset + cur; } +static void gfx_v9_0_ring_emit_tmz (struct amdgpu_ring *ring,bool +start) { +amdgpu_ring_write (ring,PACKET3 (PACKET3_FRAME_CONTROL ,0 )); +amdgpu_ring_write (ring,FRAME_CMD (start ?0 :1 ));/* frame_end */ } +static void gfx_v9_0_ring_emit_rreg (struct amdgpu_ring *ring,uint32_t reg) { struct amdgpu_device *adev = ring->adev; @@ -3579,6 +3585,7 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_gfx = { .emit_cntxcntl = gfx_v9_ring_emit_cntxcntl, .init_cond_exec = gfx_v9_0_ring_emit_init_cond_exec,
.patch_cond_exec = gfx_v9_0_ring_emit_patch_cond_exec,
+ .emit_tmz = gfx_v9_0_ring_emit_tmz,
};
static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_compute = {
--
2.7.4
_______________________________________________
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