[1/3] drm/amdgpu: Improve doorbell variable names

Submitted by Zhao, Yong on Feb. 6, 2019, 3:55 p.m.

Details

Message ID SN1PR12MB2365312DF1DC8162D69C44C5F06F0@SN1PR12MB2365.namprd12.prod.outlook.com
State New
Series "Series without cover letter"
Headers show

Commit Message

Zhao, Yong Feb. 6, 2019, 3:55 p.m.
Hi Alex,

I only add the corresponding changes for IH, but not for GFX as GFX does not use the similar range functions.

Regards,
Yong

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index d67f8b1dfe80..88b3bbcea756 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -642,13 +642,13 @@  struct amdgpu_nbio_funcs {
         void (*hdp_flush)(struct amdgpu_device *adev, struct amdgpu_ring *ring);
         u32 (*get_memsize)(struct amdgpu_device *adev);
         void (*sdma_doorbell_range)(struct amdgpu_device *adev, int instance,
-                       bool use_doorbell, int doorbell_index, int doorbell_size);
+                       bool use_doorbell, int index_in_dw, int range_dw_size);
         void (*enable_doorbell_aperture)(struct amdgpu_device *adev,
                                          bool enable);
         void (*enable_doorbell_selfring_aperture)(struct amdgpu_device *adev,
                                                   bool enable);
         void (*ih_doorbell_range)(struct amdgpu_device *adev,
-                                 bool use_doorbell, int doorbell_index);
+                                 bool use_doorbell, int index_in_dw);
         void (*update_medium_grain_clock_gating)(struct amdgpu_device *adev,
                                                  bool enable);
         void (*update_medium_grain_light_sleep)(struct amdgpu_device *adev,
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h
index 1cfec06f81d4..5c8d04c353d0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h
@@ -39,6 +39,7 @@  struct amdgpu_doorbell {
  * can be 64-bit, so the index defined is in qword.
  */
 struct amdgpu_doorbell_index {
+       uint32_t entry_dw_size;
         uint32_t kiq;
         uint32_t mec_ring0;
         uint32_t mec_ring1;
@@ -73,7 +74,7 @@  struct amdgpu_doorbell_index {
         };
         uint32_t max_assignment;
         /* Per engine SDMA doorbell size in dword */
-       uint32_t sdma_doorbell_range;
+       uint32_t dw_range_per_sdma_eng;
 };

 typedef enum _AMDGPU_DOORBELL_ASSIGNMENT
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h
index 1ccb1831382a..2572191b394a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h
@@ -33,7 +33,7 @@  struct amdgpu_iv_entry;
 struct amdgpu_ih_ring {
         unsigned                ring_size;
         uint32_t                ptr_mask;
-       u32                     doorbell_index;
+       u32                     doorbell_idx_in_dw;
         bool                    use_doorbell;
         bool                    use_bus_addr;

diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c b/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
index cc967dbfd631..bcc41c957b24 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
@@ -68,7 +68,7 @@  static u32 nbio_v6_1_get_memsize(struct amdgpu_device *adev)
 }

 static void nbio_v6_1_sdma_doorbell_range(struct amdgpu_device *adev, int instance,
-                       bool use_doorbell, int doorbell_index, int doorbell_size)
+                       bool use_doorbell, int index_in_dw, int range_dw_size)
 {
         u32 reg = instance == 0 ? SOC15_REG_OFFSET(NBIO, 0, mmBIF_SDMA0_DOORBELL_RANGE) :
                         SOC15_REG_OFFSET(NBIO, 0, mmBIF_SDMA1_DOORBELL_RANGE);
@@ -76,8 +76,8 @@  static void nbio_v6_1_sdma_doorbell_range(struct amdgpu_device *adev, int instan
         u32 doorbell_range = RREG32(reg);

         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, doorbell_size);
+               doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, OFFSET, index_in_dw);
+               doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, range_dw_size);
         } else
                 doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);

@@ -112,12 +112,12 @@  static void nbio_v6_1_enable_doorbell_selfring_aperture(struct amdgpu_device *ad


 static void nbio_v6_1_ih_doorbell_range(struct amdgpu_device *adev,
-                                       bool use_doorbell, int doorbell_index)
+                                       bool use_doorbell, int index_in_dw)
 {
         u32 ih_doorbell_range = RREG32_SOC15(NBIO, 0 , mmBIF_IH_DOORBELL_RANGE);

         if (use_doorbell) {
-               ih_doorbell_range = REG_SET_FIELD(ih_doorbell_range, BIF_IH_DOORBELL_RANGE, OFFSET, doorbell_index);
+               ih_doorbell_range = REG_SET_FIELD(ih_doorbell_range, BIF_IH_DOORBELL_RANGE, OFFSET, index_in_dw);
                 ih_doorbell_range = REG_SET_FIELD(ih_doorbell_range, BIF_IH_DOORBELL_RANGE, SIZE, 2);
         } else
                 ih_doorbell_range = REG_SET_FIELD(ih_doorbell_range, BIF_IH_DOORBELL_RANGE, SIZE, 0);
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c
index 1cdb98ad2db3..02a9093b464a 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c
@@ -67,7 +67,7 @@  static u32 nbio_v7_0_get_memsize(struct amdgpu_device *adev)
 }

 static void nbio_v7_0_sdma_doorbell_range(struct amdgpu_device *adev, int instance,
-                       bool use_doorbell, int doorbell_index, int doorbell_size)
+                       bool use_doorbell, int index_in_dw, int range_dw_size)
 {
         u32 reg = instance == 0 ? SOC15_REG_OFFSET(NBIO, 0, mmBIF_SDMA0_DOORBELL_RANGE) :
                         SOC15_REG_OFFSET(NBIO, 0, mmBIF_SDMA1_DOORBELL_RANGE);
@@ -75,8 +75,8 @@  static void nbio_v7_0_sdma_doorbell_range(struct amdgpu_device *adev, int instan
         u32 doorbell_range = RREG32(reg);

         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, doorbell_size);
+               doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, OFFSET, index_in_dw);
+               doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, range_dw_size);
         } else
                 doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);

@@ -96,12 +96,12 @@  static void nbio_v7_0_enable_doorbell_selfring_aperture(struct amdgpu_device *ad
 }

 static void nbio_v7_0_ih_doorbell_range(struct amdgpu_device *adev,
-                                       bool use_doorbell, int doorbell_index)
+                                       bool use_doorbell, int index_in_dw)
 {
         u32 ih_doorbell_range = RREG32_SOC15(NBIO, 0 , mmBIF_IH_DOORBELL_RANGE);

         if (use_doorbell) {
-               ih_doorbell_range = REG_SET_FIELD(ih_doorbell_range, BIF_IH_DOORBELL_RANGE, OFFSET, doorbell_index);
+               ih_doorbell_range = REG_SET_FIELD(ih_doorbell_range, BIF_IH_DOORBELL_RANGE, OFFSET, index_in_dw);
                 ih_doorbell_range = REG_SET_FIELD(ih_doorbell_range, BIF_IH_DOORBELL_RANGE, SIZE, 2);
         } else
                 ih_doorbell_range = REG_SET_FIELD(ih_doorbell_range, BIF_IH_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 221f26e50322..c32a5bd055d9 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
@@ -65,7 +65,7 @@  static u32 nbio_v7_4_get_memsize(struct amdgpu_device *adev)
 }

 static void nbio_v7_4_sdma_doorbell_range(struct amdgpu_device *adev, int instance,
-                       bool use_doorbell, int doorbell_index, int doorbell_size)
+                       bool use_doorbell, int index_in_dw, int range_dw_size)
 {
         u32 reg = instance == 0 ? SOC15_REG_OFFSET(NBIO, 0, mmBIF_SDMA0_DOORBELL_RANGE) :
                         SOC15_REG_OFFSET(NBIO, 0, mmBIF_SDMA1_DOORBELL_RANGE);
@@ -73,8 +73,8 @@  static void nbio_v7_4_sdma_doorbell_range(struct amdgpu_device *adev, int instan
         u32 doorbell_range = RREG32(reg);

         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, doorbell_size);
+               doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, OFFSET, index_in_dw);
+               doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, range_dw_size);
         } else
                 doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);

@@ -107,12 +107,12 @@  static void nbio_v7_4_enable_doorbell_selfring_aperture(struct amdgpu_device *ad
 }

 static void nbio_v7_4_ih_doorbell_range(struct amdgpu_device *adev,
-                                       bool use_doorbell, int doorbell_index)
+                                       bool use_doorbell, int index_in_dw)
 {
         u32 ih_doorbell_range = RREG32_SOC15(NBIO, 0 , mmBIF_IH_DOORBELL_RANGE);

         if (use_doorbell) {
-               ih_doorbell_range = REG_SET_FIELD(ih_doorbell_range, BIF_IH_DOORBELL_RANGE, OFFSET, doorbell_index);
+               ih_doorbell_range = REG_SET_FIELD(ih_doorbell_range, BIF_IH_DOORBELL_RANGE, OFFSET, index_in_dw);
                 ih_doorbell_range = REG_SET_FIELD(ih_doorbell_range, BIF_IH_DOORBELL_RANGE, SIZE, 2);
         } else
                 ih_doorbell_range = REG_SET_FIELD(ih_doorbell_range, BIF_IH_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 127b85983e8f..e65e9bc52bd4 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -1520,7 +1520,8 @@  static int sdma_v4_0_sw_init(void *handle)
                                 ring->use_doorbell?"true":"false");

                 /* doorbell size is 2 dwords, get DWORD offset */
-               ring->doorbell_index = adev->doorbell_index.sdma_engine[i] << 1;
+               ring->doorbell_index = adev->doorbell_index.sdma_engine[i]
+                               * adev->doorbell_index.entry_dw_size;

                 sprintf(ring->name, "sdma%d", i);
                 r = amdgpu_ring_init(adev, ring, 1024,
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 99ebcf29dcb0..fbf4dde22f6c 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -980,11 +980,11 @@  static void soc15_doorbell_range_init(struct amdgpu_device *adev)
                 ring = &adev->sdma.instance[i].ring;
                 adev->nbio_funcs->sdma_doorbell_range(adev, i,
                         ring->use_doorbell, ring->doorbell_index,
-                       adev->doorbell_index.sdma_doorbell_range);
+                       adev->doorbell_index.dw_range_per_sdma_eng);
         }

         adev->nbio_funcs->ih_doorbell_range(adev, adev->irq.ih.use_doorbell,
-                                               adev->irq.ih.doorbell_index);
+                                               adev->irq.ih.doorbell_idx_in_dw);
 }

 static int soc15_common_hw_init(void *handle)
diff --git a/drivers/gpu/drm/amd/amdgpu/tonga_ih.c b/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
index a20b711a6756..96403ec5c98f 100644
--- a/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
@@ -143,7 +143,7 @@  static int tonga_ih_irq_init(struct amdgpu_device *adev)
         ih_doorbell_rtpr = RREG32(mmIH_DOORBELL_RPTR);
         if (adev->irq.ih.use_doorbell) {
                 ih_doorbell_rtpr = REG_SET_FIELD(ih_doorbell_rtpr, IH_DOORBELL_RPTR,
-                                                OFFSET, adev->irq.ih.doorbell_index);
+                                                OFFSET, adev->irq.ih.doorbell_idx_in_dw);
                 ih_doorbell_rtpr = REG_SET_FIELD(ih_doorbell_rtpr, IH_DOORBELL_RPTR,
                                                  ENABLE, 1);
         } else {
@@ -254,7 +254,7 @@  static void tonga_ih_set_rptr(struct amdgpu_device *adev,
         if (ih->use_doorbell) {
                 /* XXX check if swapping is necessary on BE */
                 *ih->rptr_cpu = ih->rptr;
-               WDOORBELL32(ih->doorbell_index, ih->rptr);
+               WDOORBELL32(ih->doorbell_idx_in_dw, ih->rptr);
         } else {
                 WREG32(mmIH_RB_RPTR, ih->rptr);
         }
@@ -284,7 +284,7 @@  static int tonga_ih_sw_init(void *handle)
                 return r;

         adev->irq.ih.use_doorbell = true;
-       adev->irq.ih.doorbell_index = adev->doorbell_index.ih;
+       adev->irq.ih.doorbell_idx_in_dw = adev->doorbell_index.ih;

         r = amdgpu_irq_init(adev);

diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
index 6d1f804277f8..796004896661 100644
--- a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
@@ -184,7 +184,7 @@  static int vega10_ih_irq_init(struct amdgpu_device *adev)
         if (adev->irq.ih.use_doorbell) {
                 ih_doorbell_rtpr = REG_SET_FIELD(ih_doorbell_rtpr,
                                                  IH_DOORBELL_RPTR, OFFSET,
-                                                adev->irq.ih.doorbell_index);
+                                                adev->irq.ih.doorbell_idx_in_dw);
                 ih_doorbell_rtpr = REG_SET_FIELD(ih_doorbell_rtpr,
                                                  IH_DOORBELL_RPTR,
                                                  ENABLE, 1);
@@ -377,7 +377,7 @@  static void vega10_ih_set_rptr(struct amdgpu_device *adev,
         if (ih->use_doorbell) {
                 /* XXX check if swapping is necessary on BE */
                 *ih->rptr_cpu = ih->rptr;
-               WDOORBELL32(ih->doorbell_index, ih->rptr);
+               WDOORBELL32(ih->doorbell_idx_in_dw, ih->rptr);
         } else if (ih == &adev->irq.ih) {
                 WREG32_SOC15(OSSSYS, 0, mmIH_RB_RPTR, ih->rptr);
         } else if (ih == &adev->irq.ih1) {
@@ -461,7 +461,7 @@  static int vega10_ih_sw_init(void *handle)

         /* TODO add doorbell for IH1 & IH2 as well */
         adev->irq.ih.use_doorbell = true;
-       adev->irq.ih.doorbell_index = adev->doorbell_index.ih << 1;
+       adev->irq.ih.doorbell_idx_in_dw = adev->doorbell_index.ih << 1;

         r = amdgpu_irq_init(adev);

diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c b/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c
index 4b5d60ea3e78..d2409df2dde9 100644
--- a/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c
+++ b/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c
@@ -58,6 +58,7 @@  int vega10_reg_base_init(struct amdgpu_device *adev)

 void vega10_doorbell_index_init(struct amdgpu_device *adev)
 {
+       adev->doorbell_index.entry_dw_size = 2;
         adev->doorbell_index.kiq = AMDGPU_DOORBELL64_KIQ;
         adev->doorbell_index.mec_ring0 = AMDGPU_DOORBELL64_MEC_RING0;
         adev->doorbell_index.mec_ring1 = AMDGPU_DOORBELL64_MEC_RING1;
@@ -83,6 +84,9 @@  void vega10_doorbell_index_init(struct amdgpu_device *adev)
         adev->doorbell_index.uvd_vce.vce_ring6_7 = AMDGPU_DOORBELL64_VCE_RING6_7;
         /* In unit of dword doorbell */
         adev->doorbell_index.max_assignment = AMDGPU_DOORBELL64_MAX_ASSIGNMENT << 1;
-       adev->doorbell_index.sdma_doorbell_range = 4;
+       adev->doorbell_index.dw_range_per_sdma_eng =
+                       (adev->doorbell_index.sdma_engine[1]
+                       - adev->doorbell_index.sdma_engine[0])
+                       * adev->doorbell_index.entry_dw_size;
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c b/drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c
index 53716c593b2b..b28c5999d8f0 100644
--- a/drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c
+++ b/drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c
@@ -56,6 +56,7 @@  int vega20_reg_base_init(struct amdgpu_device *adev)

 void vega20_doorbell_index_init(struct amdgpu_device *adev)
 {
+       adev->doorbell_index.entry_dw_size = 2;
         adev->doorbell_index.kiq = AMDGPU_VEGA20_DOORBELL_KIQ;
         adev->doorbell_index.mec_ring0 = AMDGPU_VEGA20_DOORBELL_MEC_RING0;
         adev->doorbell_index.mec_ring1 = AMDGPU_VEGA20_DOORBELL_MEC_RING1;
@@ -86,6 +87,9 @@  void vega20_doorbell_index_init(struct amdgpu_device *adev)
         adev->doorbell_index.uvd_vce.vce_ring4_5 = AMDGPU_VEGA20_DOORBELL64_VCE_RING4_5;
         adev->doorbell_index.uvd_vce.vce_ring6_7 = AMDGPU_VEGA20_DOORBELL64_VCE_RING6_7;
         adev->doorbell_index.max_assignment = AMDGPU_VEGA20_DOORBELL_MAX_ASSIGNMENT << 1;
-       adev->doorbell_index.sdma_doorbell_range = 20;
+       adev->doorbell_index.dw_range_per_sdma_eng =
+                       (adev->doorbell_index.sdma_engine[1]
+                       - adev->doorbell_index.sdma_engine[0])
+                       * adev->doorbell_index.entry_dw_size;
 }