Skip to contentSkip to conversation

drm/amdgpu: enable paging queue doorbell support v2

PATCH In review Yang, Philip 3 participants 4 messages Nov 15, 2018 – Nov 20, 2018 3 messages not in the archive

Subsystems (2)
DRM drivers Radeon and amdgpu DRM drivers
lore
Share & tools
lore

Yang, Philip

author
#0 lore raw

PATCH 1/1 drm/amdgpu: enable paging queue doorbell support v2

paging queues doorbell index use existing assignment sDMA_HI_PRI_ENGINE0/1 index, and increase SDMA_DOORBELL_RANGE size from 2 dwords to 4 dwords to enable the new doorbell index.

v2: disable paging queue doorbell on Vega10 and Vega12 with SRIOV

Change-Id I9adb965f16ee4089d261d9a22231337739184e49
Signed-off-by Philip Yang <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c |  2 +-
 drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c |  2 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 26 ++++++++++++++++++--------
 3 files changed, 20 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c +1 -1
index 6f9c54978cc1..0eb42c29ecac 100644
@@ -80,7 +80,7 @@ static void nbio_v6_1_sdma_doorbell_range(struct amdgpu_device *adev, int instan
 
 	if (use_doorbell) {
 		doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, OFFSET, doorbell_index);
-		doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 2);
+		doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 4);
 	} else
 		doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +1 -1
index f8cee95d61cc..9342ee03d7d4 100644
@@ -76,7 +76,7 @@ static void nbio_v7_4_sdma_doorbell_range(struct amdgpu_device *adev, int instan
 
 	if (use_doorbell) {
 		doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, OFFSET, doorbell_index);
-		doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 2);
+		doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 4);
 	} else
 		doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +18 -8
index f4490cdd9804..1f19f15bb171 100644
@@ -925,11 +925,9 @@ static void sdma_v4_0_page_resume(struct amdgpu_device *adev, unsigned int i)
 					OFFSET, ring->doorbell_index);
 	WREG32_SDMA(i, mmSDMA0_PAGE_DOORBELL, doorbell);
 	WREG32_SDMA(i, mmSDMA0_PAGE_DOORBELL_OFFSET, doorbell_offset);
-	/* TODO: enable doorbell support */
-	/*adev->nbio_funcs->sdma_doorbell_range(adev, i, ring->use_doorbell,
-					      ring->doorbell_index);*/
 
-	sdma_v4_0_ring_set_wptr(ring);
+	/* paging queue doorbell index is already enabled at sdma_v4_0_gfx_resume */
+	sdma_v4_0_page_ring_set_wptr(ring);
 
 	/* set minor_ptr_update to 0 after wptr programed */
 	WREG32_SDMA(i, mmSDMA0_PAGE_MINOR_PTR_UPDATE, 0);

@@ -1504,9 +1502,6 @@ static int sdma_v4_0_sw_init(void *handle)
 		ring->ring_obj = NULL;
 		ring->use_doorbell = true;
 
-		DRM_INFO("use_doorbell being set to: [%s]\n",
-				ring->use_doorbell?"true":"false");
-
 		if (adev->asic_type == CHIP_VEGA10)
 			ring->doorbell_index = (i == 0) ?
 				(AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0 << 1) //get DWORD offset

@@ -1516,6 +1511,8 @@ static int sdma_v4_0_sw_init(void *handle)
 				(AMDGPU_DOORBELL64_sDMA_ENGINE0 << 1) //get DWORD offset
 				: (AMDGPU_DOORBELL64_sDMA_ENGINE1 << 1); // get DWORD offset
 
+		DRM_DEBUG("use_doorbell being set to: [%s] doorbell index %d\n",
+			ring->use_doorbell?"true":"false", ring->doorbell_index);
 
 		sprintf(ring->name, "sdma%d", i);
 		r = amdgpu_ring_init(adev, ring, 1024,

@@ -1529,7 +1526,20 @@ static int sdma_v4_0_sw_init(void *handle)
 		if (adev->sdma.has_page_queue) {
 			ring = &adev->sdma.instance[i].page;
 			ring->ring_obj = NULL;
-			ring->use_doorbell = false;
+			if (!amdgpu_sriov_vf(adev) || adev->asic_type == CHIP_VEGA20)
+				ring->use_doorbell = true;
+
+			if (adev->asic_type == CHIP_VEGA10)
+				ring->doorbell_index = (i == 0) ?
+					(AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE0 << 1)
+					: (AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE1 << 1);
+			else
+				ring->doorbell_index = (i == 0) ?
+					(AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE0 << 1)
+					: (AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE1 << 1);
+
+			DRM_DEBUG("paging queue doorbell being set to: [%s] doorbell index %d\n",
+				ring->use_doorbell?"true":"false", ring->doorbell_index);
 
 			sprintf(ring->name, "page%d", i);
 			r = amdgpu_ring_init(adev, ring, 1024,
Signature · 6 lines
2.17.1

_______________________________________________
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): [email protected]

Acked-by
#2 lore raw

Am 15.11.18 um 20:10 schrieb Yang, Philip:

Quoted 8 lines

paging queues doorbell index use existing assignment sDMA_HI_PRI_ENGINE0/1 index, and increase SDMA_DOORBELL_RANGE size from 2 dwords to 4 dwords to enable the new doorbell index.

v2: disable paging queue doorbell on Vega10 and Vega12 with SRIOV

Change-Id I9adb965f16ee4089d261d9a22231337739184e49
Signed-off-by Philip Yang <[email protected]>
Acked-by Christian König <[email protected]>
Quoted 81 lines
---
  drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c |  2 +-
  drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c |  2 +-
  drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 26 ++++++++++++++++++--------
  3 files changed, 20 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c +1 -1
index 6f9c54978cc1..0eb42c29ecac 100644
@@ -80,7 +80,7 @@ static void nbio_v6_1_sdma_doorbell_range(struct amdgpu_device *adev, int instan
 
  	if (use_doorbell) {
  		doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, OFFSET, doorbell_index);
-		doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 2);
+		doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 4);
  	} else
  		doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +1 -1
index f8cee95d61cc..9342ee03d7d4 100644
@@ -76,7 +76,7 @@ static void nbio_v7_4_sdma_doorbell_range(struct amdgpu_device *adev, int instan
 
  	if (use_doorbell) {
  		doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, OFFSET, doorbell_index);
-		doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 2);
+		doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 4);
  	} else
  		doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +11 -8
index f4490cdd9804..1f19f15bb171 100644
@@ -925,11 +925,9 @@ static void sdma_v4_0_page_resume(struct amdgpu_device *adev, unsigned int i)
  					OFFSET, ring->doorbell_index);
  	WREG32_SDMA(i, mmSDMA0_PAGE_DOORBELL, doorbell);
  	WREG32_SDMA(i, mmSDMA0_PAGE_DOORBELL_OFFSET, doorbell_offset);
-	/* TODO: enable doorbell support */
-	/*adev->nbio_funcs->sdma_doorbell_range(adev, i, ring->use_doorbell,
-					      ring->doorbell_index);*/
 
-	sdma_v4_0_ring_set_wptr(ring);
+	/* paging queue doorbell index is already enabled at sdma_v4_0_gfx_resume */
+	sdma_v4_0_page_ring_set_wptr(ring);
 
  	/* set minor_ptr_update to 0 after wptr programed */
  	WREG32_SDMA(i, mmSDMA0_PAGE_MINOR_PTR_UPDATE, 0);

@@ -1504,9 +1502,6 @@ static int sdma_v4_0_sw_init(void *handle)
  		ring->ring_obj = NULL;
  		ring->use_doorbell = true;
 
-		DRM_INFO("use_doorbell being set to: [%s]\n",
-				ring->use_doorbell?"true":"false");
-
  		if (adev->asic_type == CHIP_VEGA10)
  			ring->doorbell_index = (i == 0) ?
  				(AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0 << 1) //get DWORD offset

@@ -1516,6 +1511,8 @@ static int sdma_v4_0_sw_init(void *handle)
  				(AMDGPU_DOORBELL64_sDMA_ENGINE0 << 1) //get DWORD offset
  				: (AMDGPU_DOORBELL64_sDMA_ENGINE1 << 1); // get DWORD offset
 
+		DRM_DEBUG("use_doorbell being set to: [%s] doorbell index %d\n",
+			ring->use_doorbell?"true":"false", ring->doorbell_index);
 
  		sprintf(ring->name, "sdma%d", i);
  		r = amdgpu_ring_init(adev, ring, 1024,

@@ -1529,7 +1526,20 @@ static int sdma_v4_0_sw_init(void *handle)
  		if (adev->sdma.has_page_queue) {
  			ring = &adev->sdma.instance[i].page;
  			ring->ring_obj = NULL;
-			ring->use_doorbell = false;
+			if (!amdgpu_sriov_vf(adev) || adev->asic_type == CHIP_VEGA20)
+				ring->use_doorbell = true;
+
+			if (adev->asic_type == CHIP_VEGA10)
+				ring->doorbell_index = (i == 0) ?
+					(AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE0 << 1)
+					: (AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE1 << 1);

drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c static int sdma_v4_0_sw_init(void *handle) · line 1545

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +7 -0
+			else
+				ring->doorbell_index = (i == 0) ?
+					(AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE0 << 1)
+					: (AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE1 << 1);
+
+			DRM_DEBUG("paging queue doorbell being set to: [%s] doorbell index %d\n",
+				ring->use_doorbell?"true":"false", ring->doorbell_index);
 
  			sprintf(ring->name, "page%d", i);
  			r = amdgpu_ring_init(adev, ring, 1024,

_______________________________________________
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): 93f3ef85-337c-e527-dc1e-b54deebe7065-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

#4 lore raw

Hi Christian,

Quoted 7 lines · Christian König

Am 15.11.18 um 20:10 schrieb Yang, Philip:

Quoted 6 lines

paging queues doorbell index use existing assignment sDMA_HI_PRI_ENGINE0/1
index, and increase SDMA_DOORBELL_RANGE size from 2 dwords to 4 dwords to
enable the new doorbell index.

Quoted 6 lines
Quoted 4 lines

v2: disable paging queue doorbell on Vega10 and Vega12 with SRIOV

Change-Id I9adb965f16ee4089d261d9a22231337739184e49
Signed-off-by Philip Yang <[email protected]>
Acked-by Christian König <[email protected]>

This change was superseded by "drm/amdgpu: enable paging queue doorbell support v3", which doesn't need to change the doorbell routing and no special rules for SRIOV. Instead it uses two pages from the doorbell aperture. That's OK, because KFD only uses page 2 and up.

Regards,
  Felix

Quoted 103 lines
Quoted 103 lines

---

  drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c |  2 +-
  drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c |  2 +-
  drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 26 ++++++++++++++++++--------
  3 files changed, 20 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c +0 -0
index 6f9c54978cc1..0eb42c29ecac 100644
@@ -80,7 +80,7 @@ static void nbio_v6_1_sdma_doorbell_range(struct

amdgpu_device *adev, int instan
        if (use_doorbell) {
          doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, OFFSET, doorbell_index); -        doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 2);
+        doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 4);
      } else
          doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);
  diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
index f8cee95d61cc..9342ee03d7d4 100644

drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +0 -0
@@ -76,7 +76,7 @@ static void nbio_v7_4_sdma_doorbell_range(struct

amdgpu_device *adev, int instan
        if (use_doorbell) {
          doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, OFFSET, doorbell_index); -        doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 2);
+        doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 4);
      } else
          doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);
  diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index f4490cdd9804..1f19f15bb171 100644

drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +1 -3
@@ -925,11 +925,9 @@ static void sdma_v4_0_page_resume(struct
 amdgpu_device *adev, unsigned int i)
                       OFFSET, ring->doorbell_index);
       WREG32_SDMA(i, mmSDMA0_PAGE_DOORBELL, doorbell);
       WREG32_SDMA(i, mmSDMA0_PAGE_DOORBELL_OFFSET, doorbell_offset);
-    /* TODO: enable doorbell support */
-    /*adev->nbio_funcs->sdma_doorbell_range(adev, i,
 ring->use_doorbell,
-                          ring->doorbell_index);*/
   -    sdma_v4_0_ring_set_wptr(ring);
+    /* paging queue doorbell index is already enabled at

sdma_v4_0_gfx_resume */
+    sdma_v4_0_page_ring_set_wptr(ring);
        /* set minor_ptr_update to 0 after wptr programed */ WREG32_SDMA(i, mmSDMA0_PAGE_MINOR_PTR_UPDATE, 0);

drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +0 -2
@@ -1504,9 +1502,6 @@ static int sdma_v4_0_sw_init(void *handle)
           ring->ring_obj = NULL;
           ring->use_doorbell = true;
   -        DRM_INFO("use_doorbell being set to: [%s]\n",
-                ring->use_doorbell?"true":"false");
-
           if (adev->asic_type == CHIP_VEGA10)

              ring->doorbell_index = (i == 0) ? (AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0 << 1) //get DWORD offset

drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +0 -0
@@ -1516,6 +1511,8 @@ static int sdma_v4_0_sw_init(void *handle)

                  (AMDGPU_DOORBELL64_sDMA_ENGINE0 << 1) //get DWORD offset
                  : (AMDGPU_DOORBELL64_sDMA_ENGINE1 << 1); // get DWORD offset
  +        DRM_DEBUG("use_doorbell being set to: [%s] doorbell index %d\n",
+            ring->use_doorbell?"true":"false", ring->doorbell_index); sprintf(ring->name, "sdma%d", i);
          r = amdgpu_ring_init(adev, ring, 1024,

drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +14 -1
@@ -1529,7 +1526,20 @@ static int sdma_v4_0_sw_init(void *handle)
           if (adev->sdma.has_page_queue) {
               ring = &adev->sdma.instance[i].page;
               ring->ring_obj = NULL;
-            ring->use_doorbell = false;
+            if (!amdgpu_sriov_vf(adev) || adev->asic_type ==
 CHIP_VEGA20)
+                ring->use_doorbell = true;
+
+            if (adev->asic_type == CHIP_VEGA10)
+                ring->doorbell_index = (i == 0) ?
+                    (AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE0 << 1)
+                    : (AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE1
 << 1);
+            else
+                ring->doorbell_index = (i == 0) ?
+                    (AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE0 << 1)
+                    : (AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE1 << 1);
+
+            DRM_DEBUG("paging queue doorbell being set to: [%s]
 doorbell index %d\n",
+                ring->use_doorbell?"true":"false",
Quoted 8 lines
Quoted 3 lines

ring->doorbell_index);
                sprintf(ring->name, "page%d", i); r = amdgpu_ring_init(adev, ring, 1024,

_______________________________________________
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): ea885c40-daa4-b3ef-faec-35c826c874aa-5C7GfCeVMHo@public.gmane.org

#6 lore raw

Am 19.11.18 um 21:08 schrieb Kuehling, Felix:

Quoted 12 lines

Hi Christian,

Quoted 9 lines · Christian König

Am 15.11.18 um 20:10 schrieb Yang, Philip:

Quoted 8 lines

paging queues doorbell index use existing assignment sDMA_HI_PRI_ENGINE0/1
index, and increase SDMA_DOORBELL_RANGE size from 2 dwords to 4 dwords to
enable the new doorbell index.

v2: disable paging queue doorbell on Vega10 and Vega12 with SRIOV

Quoted 7 lines
Quoted 3 lines
Quoted 2 lines
Change-Id I9adb965f16ee4089d261d9a22231337739184e49
Signed-off-by Philip Yang <[email protected]>
Acked-by Christian König <[email protected]>

This change was superseded by "drm/amdgpu: enable paging queue doorbell support v3", which doesn't need to change the doorbell routing and no special rules for SRIOV. Instead it uses two pages from the doorbell aperture. That's OK, because KFD only uses page 2 and up.

Ah, yeah hadn't seen that patch yet.

Thanks,
Christian.

Quoted 114 lines

Regards,
  Felix

Quoted 101 lines
Quoted 101 lines
---
   drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c |  2 +-
   drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c |  2 +-
   drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 26 ++++++++++++++++++--------
   3 files changed, 20 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c +0 -0
index 6f9c54978cc1..0eb42c29ecac 100644
@@ -80,7 +80,7 @@ static void nbio_v6_1_sdma_doorbell_range(struct

amdgpu_device *adev, int instan
        if (use_doorbell) {
          doorbell_range = REG_SET_FIELD(doorbell_range,
BIF_SDMA0_DOORBELL_RANGE, OFFSET, doorbell_index); -        doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 2);
+        doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 4);
      } else
          doorbell_range = REG_SET_FIELD(doorbell_range,
BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);
  diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
index f8cee95d61cc..9342ee03d7d4 100644

drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +0 -0
@@ -76,7 +76,7 @@ static void nbio_v7_4_sdma_doorbell_range(struct

amdgpu_device *adev, int instan
        if (use_doorbell) {
          doorbell_range = REG_SET_FIELD(doorbell_range,
BIF_SDMA0_DOORBELL_RANGE, OFFSET, doorbell_index); -        doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 2);
+        doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 4);
      } else
          doorbell_range = REG_SET_FIELD(doorbell_range,
BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);
  diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index f4490cdd9804..1f19f15bb171 100644

drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +1 -3
@@ -925,11 +925,9 @@ static void sdma_v4_0_page_resume(struct
 amdgpu_device *adev, unsigned int i)
                       OFFSET, ring->doorbell_index);
       WREG32_SDMA(i, mmSDMA0_PAGE_DOORBELL, doorbell);
       WREG32_SDMA(i, mmSDMA0_PAGE_DOORBELL_OFFSET, doorbell_offset);
-    /* TODO: enable doorbell support */
-    /*adev->nbio_funcs->sdma_doorbell_range(adev, i,
 ring->use_doorbell,
-                          ring->doorbell_index);*/
   -    sdma_v4_0_ring_set_wptr(ring);
+    /* paging queue doorbell index is already enabled at

sdma_v4_0_gfx_resume */
+    sdma_v4_0_page_ring_set_wptr(ring);
        /* set minor_ptr_update to 0 after wptr programed */ WREG32_SDMA(i, mmSDMA0_PAGE_MINOR_PTR_UPDATE, 0);

drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +0 -2
@@ -1504,9 +1502,6 @@ static int sdma_v4_0_sw_init(void *handle)
           ring->ring_obj = NULL;
           ring->use_doorbell = true;
   -        DRM_INFO("use_doorbell being set to: [%s]\n",
-                ring->use_doorbell?"true":"false");
-
           if (adev->asic_type == CHIP_VEGA10)
               ring->doorbell_index = (i == 0) ?
                   (AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0 << 1) //get

DWORD offset

drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +0 -0
@@ -1516,6 +1511,8 @@ static int sdma_v4_0_sw_init(void *handle)
                   (AMDGPU_DOORBELL64_sDMA_ENGINE0 << 1) //get DWORD

offset
                  : (AMDGPU_DOORBELL64_sDMA_ENGINE1 << 1); // get
DWORD offset
  +        DRM_DEBUG("use_doorbell being set to: [%s] doorbell index
%d\n",
+            ring->use_doorbell?"true":"false", ring->doorbell_index);
            sprintf(ring->name, "sdma%d", i);
          r = amdgpu_ring_init(adev, ring, 1024,

drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +13 -1
@@ -1529,7 +1526,20 @@ static int sdma_v4_0_sw_init(void *handle)
           if (adev->sdma.has_page_queue) {
               ring = &adev->sdma.instance[i].page;
               ring->ring_obj = NULL;
-            ring->use_doorbell = false;
+            if (!amdgpu_sriov_vf(adev) || adev->asic_type ==
 CHIP_VEGA20)
+                ring->use_doorbell = true;
+
+            if (adev->asic_type == CHIP_VEGA10)
+                ring->doorbell_index = (i == 0) ?
+                    (AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE0 << 1)
+                    : (AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE1
 << 1);
+            else
+                ring->doorbell_index = (i == 0) ?
+                    (AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE0 << 1)
+                    : (AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE1 << 1);
+
+            DRM_DEBUG("paging queue doorbell being set to: [%s]
 doorbell index %d\n",
Quoted 8 lines
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +1 -0
+                ring->use_doorbell?"true":"false",

ring->doorbell_index);
                sprintf(ring->name, "page%d", i); r = amdgpu_ring_init(adev, ring, 1024,

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

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