AMD-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
* Merge get_rptr and get_wptr functions
@ 2016-09-02 12:49 Tom St Denis
       [not found] ` <20160902124908.18360-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
  0 siblings, 1 reply; 9+ messages in thread
From: Tom St Denis @ 2016-09-02 12:49 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW

These patches merge the ring get_rptr and get_wptr functions
from each of the GFX drivers between gfx and compute rings.

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

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH 1/6] drm/amd/amdgpu: Merge get_rptr functions in gfx6
       [not found] ` <20160902124908.18360-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
@ 2016-09-02 12:49   ` Tom St Denis
  2016-09-02 12:49   ` [PATCH 2/6] drm/amd/amdgpu: Merge get_rptr functions in gfx7 Tom St Denis
                     ` (5 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Tom St Denis @ 2016-09-02 12:49 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Tom St Denis

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
index 63ca77937714..8cc5025d8a4d 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
@@ -1655,7 +1655,7 @@ static int gfx_v6_0_cp_gfx_resume(struct amdgpu_device *adev)
 	return 0;
 }
 
-static u32 gfx_v6_0_ring_get_rptr_gfx(struct amdgpu_ring *ring)
+static u32 gfx_v6_0_ring_get_rptr(struct amdgpu_ring *ring)
 {
 	return ring->adev->wb.wb[ring->rptr_offs];
 }
@@ -1675,11 +1675,6 @@ static void gfx_v6_0_ring_set_wptr_gfx(struct amdgpu_ring *ring)
 	(void)RREG32(CP_RB0_WPTR);
 }
 
-static u32 gfx_v6_0_ring_get_rptr_compute(struct amdgpu_ring *ring)
-{
-	return ring->adev->wb.wb[ring->rptr_offs];
-}
-
 static u32 gfx_v6_0_ring_get_wptr_compute(struct amdgpu_ring *ring)
 {
 	struct amdgpu_device *adev = ring->adev;
@@ -3152,7 +3147,7 @@ const struct amd_ip_funcs gfx_v6_0_ip_funcs = {
 };
 
 static const struct amdgpu_ring_funcs gfx_v6_0_ring_funcs_gfx = {
-	.get_rptr = gfx_v6_0_ring_get_rptr_gfx,
+	.get_rptr = gfx_v6_0_ring_get_rptr,
 	.get_wptr = gfx_v6_0_ring_get_wptr_gfx,
 	.set_wptr = gfx_v6_0_ring_set_wptr_gfx,
 	.parse_cs = NULL,
@@ -3169,7 +3164,7 @@ static const struct amdgpu_ring_funcs gfx_v6_0_ring_funcs_gfx = {
 };
 
 static const struct amdgpu_ring_funcs gfx_v6_0_ring_funcs_compute = {
-	.get_rptr = gfx_v6_0_ring_get_rptr_compute,
+	.get_rptr = gfx_v6_0_ring_get_rptr,
 	.get_wptr = gfx_v6_0_ring_get_wptr_compute,
 	.set_wptr = gfx_v6_0_ring_set_wptr_compute,
 	.parse_cs = NULL,
-- 
2.9.3

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

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 2/6] drm/amd/amdgpu: Merge get_rptr functions in gfx7
       [not found] ` <20160902124908.18360-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
  2016-09-02 12:49   ` [PATCH 1/6] drm/amd/amdgpu: Merge get_rptr functions in gfx6 Tom St Denis
@ 2016-09-02 12:49   ` Tom St Denis
  2016-09-02 12:49   ` [PATCH 3/6] drm/amd/amdgpu: Merge get_rptr functions in gfx8 Tom St Denis
                     ` (4 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Tom St Denis @ 2016-09-02 12:49 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Tom St Denis

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
index 99afab8113f1..84ad13ec3771 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
@@ -2443,7 +2443,7 @@ static int gfx_v7_0_cp_gfx_resume(struct amdgpu_device *adev)
 	return 0;
 }
 
-static u32 gfx_v7_0_ring_get_rptr_gfx(struct amdgpu_ring *ring)
+static u32 gfx_v7_0_ring_get_rptr(struct amdgpu_ring *ring)
 {
 	return ring->adev->wb.wb[ring->rptr_offs];
 }
@@ -2463,11 +2463,6 @@ static void gfx_v7_0_ring_set_wptr_gfx(struct amdgpu_ring *ring)
 	(void)RREG32(mmCP_RB0_WPTR);
 }
 
-static u32 gfx_v7_0_ring_get_rptr_compute(struct amdgpu_ring *ring)
-{
-	return ring->adev->wb.wb[ring->rptr_offs];
-}
-
 static u32 gfx_v7_0_ring_get_wptr_compute(struct amdgpu_ring *ring)
 {
 	/* XXX check if swapping is necessary on BE */
@@ -4920,7 +4915,7 @@ const struct amd_ip_funcs gfx_v7_0_ip_funcs = {
 };
 
 static const struct amdgpu_ring_funcs gfx_v7_0_ring_funcs_gfx = {
-	.get_rptr = gfx_v7_0_ring_get_rptr_gfx,
+	.get_rptr = gfx_v7_0_ring_get_rptr,
 	.get_wptr = gfx_v7_0_ring_get_wptr_gfx,
 	.set_wptr = gfx_v7_0_ring_set_wptr_gfx,
 	.parse_cs = NULL,
@@ -4938,7 +4933,7 @@ static const struct amdgpu_ring_funcs gfx_v7_0_ring_funcs_gfx = {
 };
 
 static const struct amdgpu_ring_funcs gfx_v7_0_ring_funcs_compute = {
-	.get_rptr = gfx_v7_0_ring_get_rptr_compute,
+	.get_rptr = gfx_v7_0_ring_get_rptr,
 	.get_wptr = gfx_v7_0_ring_get_wptr_compute,
 	.set_wptr = gfx_v7_0_ring_set_wptr_compute,
 	.parse_cs = NULL,
-- 
2.9.3

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

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 3/6] drm/amd/amdgpu: Merge get_rptr functions in gfx8
       [not found] ` <20160902124908.18360-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
  2016-09-02 12:49   ` [PATCH 1/6] drm/amd/amdgpu: Merge get_rptr functions in gfx6 Tom St Denis
  2016-09-02 12:49   ` [PATCH 2/6] drm/amd/amdgpu: Merge get_rptr functions in gfx7 Tom St Denis
@ 2016-09-02 12:49   ` Tom St Denis
  2016-09-02 12:49   ` [PATCH 4/6] drm/amd/amdgpu: Merge get_wptr functions in gfx6 Tom St Denis
                     ` (3 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Tom St Denis @ 2016-09-02 12:49 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Tom St Denis

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index c14ba7079ea3..02056762ea06 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -5835,7 +5835,7 @@ static int gfx_v8_0_set_clockgating_state(void *handle,
 	return 0;
 }
 
-static u32 gfx_v8_0_ring_get_rptr_gfx(struct amdgpu_ring *ring)
+static u32 gfx_v8_0_ring_get_rptr(struct amdgpu_ring *ring)
 {
 	return ring->adev->wb.wb[ring->rptr_offs];
 }
@@ -6051,11 +6051,6 @@ static void gfx_v8_0_ring_emit_vm_flush(struct amdgpu_ring *ring,
 	}
 }
 
-static u32 gfx_v8_0_ring_get_rptr_compute(struct amdgpu_ring *ring)
-{
-	return ring->adev->wb.wb[ring->rptr_offs];
-}
-
 static u32 gfx_v8_0_ring_get_wptr_compute(struct amdgpu_ring *ring)
 {
 	return ring->adev->wb.wb[ring->wptr_offs];
@@ -6263,7 +6258,7 @@ const struct amd_ip_funcs gfx_v8_0_ip_funcs = {
 };
 
 static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = {
-	.get_rptr = gfx_v8_0_ring_get_rptr_gfx,
+	.get_rptr = gfx_v8_0_ring_get_rptr,
 	.get_wptr = gfx_v8_0_ring_get_wptr_gfx,
 	.set_wptr = gfx_v8_0_ring_set_wptr_gfx,
 	.parse_cs = NULL,
@@ -6282,7 +6277,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = {
 };
 
 static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute = {
-	.get_rptr = gfx_v8_0_ring_get_rptr_compute,
+	.get_rptr = gfx_v8_0_ring_get_rptr,
 	.get_wptr = gfx_v8_0_ring_get_wptr_compute,
 	.set_wptr = gfx_v8_0_ring_set_wptr_compute,
 	.parse_cs = NULL,
-- 
2.9.3

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

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 4/6] drm/amd/amdgpu: Merge get_wptr functions in gfx6
       [not found] ` <20160902124908.18360-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
                     ` (2 preceding siblings ...)
  2016-09-02 12:49   ` [PATCH 3/6] drm/amd/amdgpu: Merge get_rptr functions in gfx8 Tom St Denis
@ 2016-09-02 12:49   ` Tom St Denis
  2016-09-02 12:49   ` [PATCH 5/6] drm/amd/amdgpu: Merge get_wptr functions in gfx7 Tom St Denis
                     ` (2 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Tom St Denis @ 2016-09-02 12:49 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Tom St Denis

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
index 8cc5025d8a4d..73685a4816fe 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
@@ -1660,11 +1660,18 @@ static u32 gfx_v6_0_ring_get_rptr(struct amdgpu_ring *ring)
 	return ring->adev->wb.wb[ring->rptr_offs];
 }
 
-static u32 gfx_v6_0_ring_get_wptr_gfx(struct amdgpu_ring *ring)
+static u32 gfx_v6_0_ring_get_wptr(struct amdgpu_ring *ring)
 {
 	struct amdgpu_device *adev = ring->adev;
 
-	return RREG32(CP_RB0_WPTR);
+	if (ring == &adev->gfx.gfx_ring[0])
+		return RREG32(CP_RB0_WPTR);
+	else if (ring == &adev->gfx.compute_ring[0])
+		return RREG32(CP_RB1_WPTR);
+	else if (ring == &adev->gfx.compute_ring[1])
+		return RREG32(CP_RB2_WPTR);
+	else
+		BUG();
 }
 
 static void gfx_v6_0_ring_set_wptr_gfx(struct amdgpu_ring *ring)
@@ -1675,22 +1682,6 @@ static void gfx_v6_0_ring_set_wptr_gfx(struct amdgpu_ring *ring)
 	(void)RREG32(CP_RB0_WPTR);
 }
 
-static u32 gfx_v6_0_ring_get_wptr_compute(struct amdgpu_ring *ring)
-{
-	struct amdgpu_device *adev = ring->adev;
-	u32 wptr;
-
-	if (ring == &adev->gfx.compute_ring[0]) {
-		wptr = RREG32(CP_RB1_WPTR);
-	} else if (ring == &adev->gfx.compute_ring[1]) {
-		wptr = RREG32(CP_RB2_WPTR);
-	} else {
-		BUG();
-	}
-
-	return wptr;
-}
-
 static void gfx_v6_0_ring_set_wptr_compute(struct amdgpu_ring *ring)
 {
 	struct amdgpu_device *adev = ring->adev;
@@ -3148,7 +3139,7 @@ const struct amd_ip_funcs gfx_v6_0_ip_funcs = {
 
 static const struct amdgpu_ring_funcs gfx_v6_0_ring_funcs_gfx = {
 	.get_rptr = gfx_v6_0_ring_get_rptr,
-	.get_wptr = gfx_v6_0_ring_get_wptr_gfx,
+	.get_wptr = gfx_v6_0_ring_get_wptr,
 	.set_wptr = gfx_v6_0_ring_set_wptr_gfx,
 	.parse_cs = NULL,
 	.emit_ib = gfx_v6_0_ring_emit_ib_gfx,
@@ -3165,7 +3156,7 @@ static const struct amdgpu_ring_funcs gfx_v6_0_ring_funcs_gfx = {
 
 static const struct amdgpu_ring_funcs gfx_v6_0_ring_funcs_compute = {
 	.get_rptr = gfx_v6_0_ring_get_rptr,
-	.get_wptr = gfx_v6_0_ring_get_wptr_compute,
+	.get_wptr = gfx_v6_0_ring_get_wptr,
 	.set_wptr = gfx_v6_0_ring_set_wptr_compute,
 	.parse_cs = NULL,
 	.emit_ib = gfx_v6_0_ring_emit_ib_compute,
-- 
2.9.3

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

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 5/6] drm/amd/amdgpu: Merge get_wptr functions in gfx7
       [not found] ` <20160902124908.18360-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
                     ` (3 preceding siblings ...)
  2016-09-02 12:49   ` [PATCH 4/6] drm/amd/amdgpu: Merge get_wptr functions in gfx6 Tom St Denis
@ 2016-09-02 12:49   ` Tom St Denis
  2016-09-02 12:49   ` [PATCH 6/6] drm/amd/amdgpu: Merge get_wptr functions in gfx8 Tom St Denis
  2016-09-02 13:58   ` Merge get_rptr and get_wptr functions Deucher, Alexander
  6 siblings, 0 replies; 9+ messages in thread
From: Tom St Denis @ 2016-09-02 12:49 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Tom St Denis

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
index 84ad13ec3771..926fd570f0ed 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
@@ -2448,11 +2448,14 @@ static u32 gfx_v7_0_ring_get_rptr(struct amdgpu_ring *ring)
 	return ring->adev->wb.wb[ring->rptr_offs];
 }
 
-static u32 gfx_v7_0_ring_get_wptr_gfx(struct amdgpu_ring *ring)
+static u32 gfx_v7_0_ring_get_wptr(struct amdgpu_ring *ring)
 {
 	struct amdgpu_device *adev = ring->adev;
 
-	return RREG32(mmCP_RB0_WPTR);
+	if (ring == &adev->gfx.gfx_ring[0])
+		return RREG32(mmCP_RB0_WPTR);
+	else
+		return ring->adev->wb.wb[ring->wptr_offs];
 }
 
 static void gfx_v7_0_ring_set_wptr_gfx(struct amdgpu_ring *ring)
@@ -2463,12 +2466,6 @@ static void gfx_v7_0_ring_set_wptr_gfx(struct amdgpu_ring *ring)
 	(void)RREG32(mmCP_RB0_WPTR);
 }
 
-static u32 gfx_v7_0_ring_get_wptr_compute(struct amdgpu_ring *ring)
-{
-	/* XXX check if swapping is necessary on BE */
-	return ring->adev->wb.wb[ring->wptr_offs];
-}
-
 static void gfx_v7_0_ring_set_wptr_compute(struct amdgpu_ring *ring)
 {
 	struct amdgpu_device *adev = ring->adev;
@@ -4916,7 +4913,7 @@ const struct amd_ip_funcs gfx_v7_0_ip_funcs = {
 
 static const struct amdgpu_ring_funcs gfx_v7_0_ring_funcs_gfx = {
 	.get_rptr = gfx_v7_0_ring_get_rptr,
-	.get_wptr = gfx_v7_0_ring_get_wptr_gfx,
+	.get_wptr = gfx_v7_0_ring_get_wptr,
 	.set_wptr = gfx_v7_0_ring_set_wptr_gfx,
 	.parse_cs = NULL,
 	.emit_ib = gfx_v7_0_ring_emit_ib_gfx,
@@ -4934,7 +4931,7 @@ static const struct amdgpu_ring_funcs gfx_v7_0_ring_funcs_gfx = {
 
 static const struct amdgpu_ring_funcs gfx_v7_0_ring_funcs_compute = {
 	.get_rptr = gfx_v7_0_ring_get_rptr,
-	.get_wptr = gfx_v7_0_ring_get_wptr_compute,
+	.get_wptr = gfx_v7_0_ring_get_wptr,
 	.set_wptr = gfx_v7_0_ring_set_wptr_compute,
 	.parse_cs = NULL,
 	.emit_ib = gfx_v7_0_ring_emit_ib_compute,
-- 
2.9.3

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

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 6/6] drm/amd/amdgpu: Merge get_wptr functions in gfx8
       [not found] ` <20160902124908.18360-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
                     ` (4 preceding siblings ...)
  2016-09-02 12:49   ` [PATCH 5/6] drm/amd/amdgpu: Merge get_wptr functions in gfx7 Tom St Denis
@ 2016-09-02 12:49   ` Tom St Denis
  2016-09-02 13:58   ` Merge get_rptr and get_wptr functions Deucher, Alexander
  6 siblings, 0 replies; 9+ messages in thread
From: Tom St Denis @ 2016-09-02 12:49 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Tom St Denis

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 02056762ea06..d8b17745bc19 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -5840,12 +5840,12 @@ static u32 gfx_v8_0_ring_get_rptr(struct amdgpu_ring *ring)
 	return ring->adev->wb.wb[ring->rptr_offs];
 }
 
-static u32 gfx_v8_0_ring_get_wptr_gfx(struct amdgpu_ring *ring)
+static u32 gfx_v8_0_ring_get_wptr(struct amdgpu_ring *ring)
 {
 	struct amdgpu_device *adev = ring->adev;
 
-	if (ring->use_doorbell)
-		/* XXX check if swapping is necessary on BE */
+	if (ring->use_doorbell ||
+	    ring != &adev->gfx.gfx_ring[0])
 		return ring->adev->wb.wb[ring->wptr_offs];
 	else
 		return RREG32(mmCP_RB0_WPTR);
@@ -6051,11 +6051,6 @@ static void gfx_v8_0_ring_emit_vm_flush(struct amdgpu_ring *ring,
 	}
 }
 
-static u32 gfx_v8_0_ring_get_wptr_compute(struct amdgpu_ring *ring)
-{
-	return ring->adev->wb.wb[ring->wptr_offs];
-}
-
 static void gfx_v8_0_ring_set_wptr_compute(struct amdgpu_ring *ring)
 {
 	struct amdgpu_device *adev = ring->adev;
@@ -6259,7 +6254,7 @@ const struct amd_ip_funcs gfx_v8_0_ip_funcs = {
 
 static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = {
 	.get_rptr = gfx_v8_0_ring_get_rptr,
-	.get_wptr = gfx_v8_0_ring_get_wptr_gfx,
+	.get_wptr = gfx_v8_0_ring_get_wptr,
 	.set_wptr = gfx_v8_0_ring_set_wptr_gfx,
 	.parse_cs = NULL,
 	.emit_ib = gfx_v8_0_ring_emit_ib_gfx,
@@ -6278,7 +6273,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = {
 
 static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute = {
 	.get_rptr = gfx_v8_0_ring_get_rptr,
-	.get_wptr = gfx_v8_0_ring_get_wptr_compute,
+	.get_wptr = gfx_v8_0_ring_get_wptr,
 	.set_wptr = gfx_v8_0_ring_set_wptr_compute,
 	.parse_cs = NULL,
 	.emit_ib = gfx_v8_0_ring_emit_ib_compute,
-- 
2.9.3

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

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* RE: Merge get_rptr and get_wptr functions
       [not found] ` <20160902124908.18360-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
                     ` (5 preceding siblings ...)
  2016-09-02 12:49   ` [PATCH 6/6] drm/amd/amdgpu: Merge get_wptr functions in gfx8 Tom St Denis
@ 2016-09-02 13:58   ` Deucher, Alexander
       [not found]     ` <MWHPR12MB16944757DF4E9517905BDDC6F7E50-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
  6 siblings, 1 reply; 9+ messages in thread
From: Deucher, Alexander @ 2016-09-02 13:58 UTC (permalink / raw)
  To: 'Tom St Denis',
	amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf
> Of Tom St Denis
> Sent: Friday, September 02, 2016 8:49 AM
> To: amd-gfx@lists.freedesktop.org
> Subject: Merge get_rptr and get_wptr functions
> 
> These patches merge the ring get_rptr and get_wptr functions
> from each of the GFX drivers between gfx and compute rings.

Patches 1-4 are:
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
For 5 and 6, I think the logic is clearer as is.

Alex


> 
> _______________________________________________
> 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

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: Merge get_rptr and get_wptr functions
       [not found]     ` <MWHPR12MB16944757DF4E9517905BDDC6F7E50-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
@ 2016-09-02 14:02       ` Christian König
  0 siblings, 0 replies; 9+ messages in thread
From: Christian König @ 2016-09-02 14:02 UTC (permalink / raw)
  To: Deucher, Alexander, 'Tom St Denis',
	amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org

Am 02.09.2016 um 15:58 schrieb Deucher, Alexander:
>> -----Original Message-----
>> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf
>> Of Tom St Denis
>> Sent: Friday, September 02, 2016 8:49 AM
>> To: amd-gfx@lists.freedesktop.org
>> Subject: Merge get_rptr and get_wptr functions
>>
>> These patches merge the ring get_rptr and get_wptr functions
>> from each of the GFX drivers between gfx and compute rings.
> Patches 1-4 are:
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> For 5 and 6, I think the logic is clearer as is.

Yeah, agree. The special doorbell handling isn't used nor necessary for 
the gfx ring.

So patches 1-4 are Reviewed-by: Christian König 
<christian.koenig@amd.com> as well.

Christian.

>
> Alex
>
>
>> _______________________________________________
>> 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


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

^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-09-02 14:02 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-02 12:49 Merge get_rptr and get_wptr functions Tom St Denis
     [not found] ` <20160902124908.18360-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
2016-09-02 12:49   ` [PATCH 1/6] drm/amd/amdgpu: Merge get_rptr functions in gfx6 Tom St Denis
2016-09-02 12:49   ` [PATCH 2/6] drm/amd/amdgpu: Merge get_rptr functions in gfx7 Tom St Denis
2016-09-02 12:49   ` [PATCH 3/6] drm/amd/amdgpu: Merge get_rptr functions in gfx8 Tom St Denis
2016-09-02 12:49   ` [PATCH 4/6] drm/amd/amdgpu: Merge get_wptr functions in gfx6 Tom St Denis
2016-09-02 12:49   ` [PATCH 5/6] drm/amd/amdgpu: Merge get_wptr functions in gfx7 Tom St Denis
2016-09-02 12:49   ` [PATCH 6/6] drm/amd/amdgpu: Merge get_wptr functions in gfx8 Tom St Denis
2016-09-02 13:58   ` Merge get_rptr and get_wptr functions Deucher, Alexander
     [not found]     ` <MWHPR12MB16944757DF4E9517905BDDC6F7E50-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2016-09-02 14:02       ` Christian König

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox