Merge tag 'hardening-v6.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_doorbell_mgr.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c
index 8eee5d783a92bd3dd3f5567b1d788acee2997602..3f3662e8b871032c21e1c02e308b78515cfc05c3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c
@@ -113,20 +113,25 @@ void amdgpu_mm_wdoorbell64(struct amdgpu_device *adev, u32 index, u64 v)
  *
  * @adev: amdgpu_device pointer
  * @db_bo: doorbell object's bo
- * @db_index: doorbell relative index in this doorbell object
+ * @doorbell_index: doorbell relative index in this doorbell object
+ * @db_size: doorbell size is in byte
  *
  * returns doorbell's absolute index in BAR
  */
 uint32_t amdgpu_doorbell_index_on_bar(struct amdgpu_device *adev,
-                                      struct amdgpu_bo *db_bo,
-                                      uint32_t doorbell_index)
+                                     struct amdgpu_bo *db_bo,
+                                     uint32_t doorbell_index,
+                                     uint32_t db_size)
 {
        int db_bo_offset;
 
        db_bo_offset = amdgpu_bo_gpu_offset_no_check(db_bo);
 
-       /* doorbell index is 32 bit but doorbell's size is 64-bit, so *2 */
-       return db_bo_offset / sizeof(u32) + doorbell_index * 2;
+       /* doorbell index is 32 bit but doorbell's size can be 32 bit
+        * or 64 bit, so *db_size(in byte)/4 for alignment.
+        */
+       return db_bo_offset / sizeof(u32) + doorbell_index *
+              DIV_ROUND_UP(db_size, 4);
 }
 
 /**