drm/amdgpu/display: Implement functions to let DC allocate GPU memory

[Why]
DC needs to communicate with PM FW through GPU memory. In order
to do so we need to be able to allocate memory from within DC.

[How]
Call amdgpu_bo_create_kernel to allocate GPU memory and use a
list in amdgpu_display_manager to track our allocations so we
can clean them up later.

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Zhan Liu <zhan.liu@amd.com>
Reviewed-by: Charlene Liu <charlene.liu@amd.com>
Acked-by: Zhan Liu <zhan.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 1d6e18adcf8b323e218174f0a24f1aba00aaed6d..4ca88ce0d44e454891a167ab021016a6200fa753 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1086,6 +1086,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
 
        init_data.flags.power_down_display_on_boot = true;
 
+       INIT_LIST_HEAD(&adev->dm.da_list);
        /* Display Core create. */
        adev->dm.dc = dc_create(&init_data);
 

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
index 3ec111736e3af82c77d1015cb80ad2a019e1b1ab..17c99623659e12f7200928443b61257d11180826 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
@@ -132,6 +132,16 @@ struct amdgpu_dm_backlight_caps {
        bool aux_support;
 };
 
+/**
+ * struct dal_allocation - Tracks mapped FB memory for SMU communication
+ */
+struct dal_allocation {
+       struct list_head list;
+       struct amdgpu_bo *bo;
+       void *cpu_ptr;
+       u64 gpu_addr;
+};
+
 /**
  * struct amdgpu_display_manager - Central amdgpu display manager device
  *
@@ -385,6 +395,12 @@ struct amdgpu_display_manager {
         */
        struct amdgpu_encoder mst_encoders[AMDGPU_DM_MAX_CRTC];
        bool force_timing_sync;
+       /**
+        * @da_list:
+        *
+        * DAL fb memory allocation list, for communication with SMU.
+        */
+       struct list_head da_list;
 };
 
 enum dsc_clock_force_state {

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
index b459f4d364056d8c874b12f034483d8c0a9c3497..b0e49d01c206670c2373dc4ccb1e87812e8b5727 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
@@ -652,8 +652,31 @@ void *dm_helpers_allocate_gpu_mem(
                size_t size,
                long long *addr)
 {
-       // TODO
-       return NULL;
+       struct amdgpu_device *adev = ctx->driver_context;
+       struct dal_allocation *da;
+       u32 domain = (type == DC_MEM_ALLOC_TYPE_GART) ?
+               AMDGPU_GEM_DOMAIN_GTT : AMDGPU_GEM_DOMAIN_VRAM;
+       int ret;
+
+       da = kzalloc(sizeof(struct dal_allocation), GFP_KERNEL);
+       if (!da)
+               return NULL;
+
+       ret = amdgpu_bo_create_kernel(adev, size, PAGE_SIZE,
+                                     domain, &da->bo,
+                                     &da->gpu_addr, &da->cpu_ptr);
+
+       *addr = da->gpu_addr;
+
+       if (ret) {
+               kfree(da);
+               return NULL;
+       }
+
+       /* add da to list in dm */
+       list_add(&da->list, &adev->dm.da_list);
+
+       return da->cpu_ptr;
 }
 
 void dm_helpers_free_gpu_mem(
@@ -661,7 +684,18 @@ void dm_helpers_free_gpu_mem(
                enum dc_gpu_mem_alloc_type type,
                void *pvMem)
 {
-       // TODO
+       struct amdgpu_device *adev = ctx->driver_context;
+       struct dal_allocation *da;
+
+       /* walk the da list in DM */
+       list_for_each_entry(da, &adev->dm.da_list, list) {
+               if (pvMem == da->cpu_ptr) {
+                       amdgpu_bo_free_kernel(&da->bo, &da->gpu_addr, &da->cpu_ptr);
+                       list_del(&da->list);
+                       kfree(da);
+                       break;
+               }
+       }
 }
 
 bool dm_helpes_dmub_outbox0_interrupt_control(struct dc_context *ctx, bool enable)