drm/nouveau/kms: Don't change EDID when it hasn't actually changed

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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
index 77fae40197ab8a86a4d7edfe38a15a5cd1ce9512..697bc2c6fdb29954d92c3a4d9e7d64d77d3385b2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
@@ -24,11 +24,10 @@
 
 #include "amdgpu.h"
 
 
 #include "amdgpu.h"
 

-struct amdgpu_gtt_mgr {
-       struct drm_mm mm;
-       spinlock_t lock;
-       atomic64_t available;
-};
+static inline struct amdgpu_gtt_mgr *to_gtt_mgr(struct ttm_resource_manager *man)
+{
+       return container_of(man, struct amdgpu_gtt_mgr, manager);
+}

 
 struct amdgpu_gtt_node {
        struct drm_mm_node node;
 
 struct amdgpu_gtt_node {
        struct drm_mm_node node;


@@ -48,9 +47,9 @@ static ssize_t amdgpu_mem_info_gtt_total_show(struct device *dev,
 {
        struct drm_device *ddev = dev_get_drvdata(dev);
        struct amdgpu_device *adev = ddev->dev_private;
 {
        struct drm_device *ddev = dev_get_drvdata(dev);
        struct amdgpu_device *adev = ddev->dev_private;

-
+       struct ttm_resource_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);

        return snprintf(buf, PAGE_SIZE, "%llu\n",
        return snprintf(buf, PAGE_SIZE, "%llu\n",

-                       (adev->mman.bdev.man[TTM_PL_TT].size) * PAGE_SIZE);
+                       man->size * PAGE_SIZE);

 }
 
 /**
 }
 
 /**


@@ -66,9 +65,9 @@ static ssize_t amdgpu_mem_info_gtt_used_show(struct device *dev,
 {
        struct drm_device *ddev = dev_get_drvdata(dev);
        struct amdgpu_device *adev = ddev->dev_private;
 {
        struct drm_device *ddev = dev_get_drvdata(dev);
        struct amdgpu_device *adev = ddev->dev_private;

-
+       struct ttm_resource_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);

        return snprintf(buf, PAGE_SIZE, "%llu\n",
        return snprintf(buf, PAGE_SIZE, "%llu\n",

-                       amdgpu_gtt_mgr_usage(&adev->mman.bdev.man[TTM_PL_TT]));
+                       amdgpu_gtt_mgr_usage(man));

 }
 
 static DEVICE_ATTR(mem_info_gtt_total, S_IRUGO,
 }
 
 static DEVICE_ATTR(mem_info_gtt_total, S_IRUGO,


@@ -76,6 +75,7 @@ static DEVICE_ATTR(mem_info_gtt_total, S_IRUGO,
 static DEVICE_ATTR(mem_info_gtt_used, S_IRUGO,
                   amdgpu_mem_info_gtt_used_show, NULL);
 
 static DEVICE_ATTR(mem_info_gtt_used, S_IRUGO,
                   amdgpu_mem_info_gtt_used_show, NULL);
 

+static const struct ttm_resource_manager_func amdgpu_gtt_mgr_func;

 /**
  * amdgpu_gtt_mgr_init - init GTT manager and DRM MM
  *
 /**
  * amdgpu_gtt_mgr_init - init GTT manager and DRM MM
  *


@@ -84,24 +84,25 @@ static DEVICE_ATTR(mem_info_gtt_used, S_IRUGO,
  *
  * Allocate and initialize the GTT manager.
  */
  *
  * Allocate and initialize the GTT manager.
  */

-static int amdgpu_gtt_mgr_init(struct ttm_mem_type_manager *man,
-                              unsigned long p_size)
+int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)

 {
 {

-       struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
-       struct amdgpu_gtt_mgr *mgr;
+       struct amdgpu_gtt_mgr *mgr = &adev->mman.gtt_mgr;
+       struct ttm_resource_manager *man = &mgr->manager;

        uint64_t start, size;
        int ret;
 
        uint64_t start, size;
        int ret;
 

-       mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
-       if (!mgr)
-               return -ENOMEM;
+       man->use_tt = true;
+       man->func = &amdgpu_gtt_mgr_func;
+       man->available_caching = TTM_PL_MASK_CACHING;
+       man->default_caching = TTM_PL_FLAG_CACHED;
+
+       ttm_resource_manager_init(man, gtt_size >> PAGE_SHIFT);

 
        start = AMDGPU_GTT_MAX_TRANSFER_SIZE * AMDGPU_GTT_NUM_TRANSFER_WINDOWS;
        size = (adev->gmc.gart_size >> PAGE_SHIFT) - start;
        drm_mm_init(&mgr->mm, start, size);
        spin_lock_init(&mgr->lock);
 
        start = AMDGPU_GTT_MAX_TRANSFER_SIZE * AMDGPU_GTT_NUM_TRANSFER_WINDOWS;
        size = (adev->gmc.gart_size >> PAGE_SHIFT) - start;
        drm_mm_init(&mgr->mm, start, size);
        spin_lock_init(&mgr->lock);

-       atomic64_set(&mgr->available, p_size);
-       man->priv = mgr;
+       atomic64_set(&mgr->available, gtt_size >> PAGE_SHIFT);

 
        ret = device_create_file(adev->dev, &dev_attr_mem_info_gtt_total);
        if (ret) {
 
        ret = device_create_file(adev->dev, &dev_attr_mem_info_gtt_total);
        if (ret) {


@@ -114,6 +115,8 @@ static int amdgpu_gtt_mgr_init(struct ttm_mem_type_manager *man,
                return ret;
        }
 
                return ret;
        }
 

+       ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_TT, &mgr->manager);
+       ttm_resource_manager_set_used(man, true);

        return 0;
 }
 
        return 0;
 }
 


@@ -125,20 +128,27 @@ static int amdgpu_gtt_mgr_init(struct ttm_mem_type_manager *man,
  * Destroy and free the GTT manager, returns -EBUSY if ranges are still
  * allocated inside it.
  */
  * Destroy and free the GTT manager, returns -EBUSY if ranges are still
  * allocated inside it.
  */

-static int amdgpu_gtt_mgr_fini(struct ttm_mem_type_manager *man)
+void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev)

 {
 {

-       struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
-       struct amdgpu_gtt_mgr *mgr = man->priv;
+       struct amdgpu_gtt_mgr *mgr = &adev->mman.gtt_mgr;
+       struct ttm_resource_manager *man = &mgr->manager;
+       int ret;
+
+       ttm_resource_manager_set_used(man, false);
+
+       ret = ttm_resource_manager_force_list_clean(&adev->mman.bdev, man);
+       if (ret)
+               return;
+

        spin_lock(&mgr->lock);
        drm_mm_takedown(&mgr->mm);
        spin_unlock(&mgr->lock);
        spin_lock(&mgr->lock);
        drm_mm_takedown(&mgr->mm);
        spin_unlock(&mgr->lock);

-       kfree(mgr);
-       man->priv = NULL;

 
        device_remove_file(adev->dev, &dev_attr_mem_info_gtt_total);
        device_remove_file(adev->dev, &dev_attr_mem_info_gtt_used);
 
 
        device_remove_file(adev->dev, &dev_attr_mem_info_gtt_total);
        device_remove_file(adev->dev, &dev_attr_mem_info_gtt_used);
 

-       return 0;
+       ttm_resource_manager_cleanup(man);
+       ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_TT, NULL);

 }
 
 /**
 }
 
 /**


@@ -148,7 +158,7 @@ static int amdgpu_gtt_mgr_fini(struct ttm_mem_type_manager *man)
  *
  * Check if a mem object has already address space allocated.
  */
  *
  * Check if a mem object has already address space allocated.
  */

-bool amdgpu_gtt_mgr_has_gart_addr(struct ttm_mem_reg *mem)
+bool amdgpu_gtt_mgr_has_gart_addr(struct ttm_resource *mem)

 {
        return mem->mm_node != NULL;
 }
 {
        return mem->mm_node != NULL;
 }


@@ -163,12 +173,12 @@ bool amdgpu_gtt_mgr_has_gart_addr(struct ttm_mem_reg *mem)
  *
  * Dummy, allocate the node but no space for it yet.
  */
  *
  * Dummy, allocate the node but no space for it yet.
  */

-static int amdgpu_gtt_mgr_new(struct ttm_mem_type_manager *man,
+static int amdgpu_gtt_mgr_new(struct ttm_resource_manager *man,

                              struct ttm_buffer_object *tbo,
                              const struct ttm_place *place,
                              struct ttm_buffer_object *tbo,
                              const struct ttm_place *place,

-                             struct ttm_mem_reg *mem)
+                             struct ttm_resource *mem)

 {
 {

-       struct amdgpu_gtt_mgr *mgr = man->priv;
+       struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);

        struct amdgpu_gtt_node *node;
        int r;
 
        struct amdgpu_gtt_node *node;
        int r;
 


@@ -226,10 +236,10 @@ err_out:
  *
  * Free the allocated GTT again.
  */
  *
  * Free the allocated GTT again.
  */

-static void amdgpu_gtt_mgr_del(struct ttm_mem_type_manager *man,
-                              struct ttm_mem_reg *mem)
+static void amdgpu_gtt_mgr_del(struct ttm_resource_manager *man,
+                              struct ttm_resource *mem)

 {
 {

-       struct amdgpu_gtt_mgr *mgr = man->priv;
+       struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);

        struct amdgpu_gtt_node *node = mem->mm_node;
 
        if (node) {
        struct amdgpu_gtt_node *node = mem->mm_node;
 
        if (node) {


@@ -249,17 +259,17 @@ static void amdgpu_gtt_mgr_del(struct ttm_mem_type_manager *man,
  *
  * Return how many bytes are used in the GTT domain
  */
  *
  * Return how many bytes are used in the GTT domain
  */

-uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man)
+uint64_t amdgpu_gtt_mgr_usage(struct ttm_resource_manager *man)

 {
 {

-       struct amdgpu_gtt_mgr *mgr = man->priv;
+       struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);

        s64 result = man->size - atomic64_read(&mgr->available);
 
        return (result > 0 ? result : 0) * PAGE_SIZE;
 }
 
        s64 result = man->size - atomic64_read(&mgr->available);
 
        return (result > 0 ? result : 0) * PAGE_SIZE;
 }
 

-int amdgpu_gtt_mgr_recover(struct ttm_mem_type_manager *man)
+int amdgpu_gtt_mgr_recover(struct ttm_resource_manager *man)

 {
 {

-       struct amdgpu_gtt_mgr *mgr = man->priv;
+       struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);

        struct amdgpu_gtt_node *node;
        struct drm_mm_node *mm_node;
        int r = 0;
        struct amdgpu_gtt_node *node;
        struct drm_mm_node *mm_node;
        int r = 0;


@@ -284,10 +294,10 @@ int amdgpu_gtt_mgr_recover(struct ttm_mem_type_manager *man)
  *
  * Dump the table content using printk.
  */
  *
  * Dump the table content using printk.
  */

-static void amdgpu_gtt_mgr_debug(struct ttm_mem_type_manager *man,
+static void amdgpu_gtt_mgr_debug(struct ttm_resource_manager *man,

                                 struct drm_printer *printer)
 {
                                 struct drm_printer *printer)
 {

-       struct amdgpu_gtt_mgr *mgr = man->priv;
+       struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);

 
        spin_lock(&mgr->lock);
        drm_mm_print(&mgr->mm, printer);
 
        spin_lock(&mgr->lock);
        drm_mm_print(&mgr->mm, printer);


@@ -298,10 +308,8 @@ static void amdgpu_gtt_mgr_debug(struct ttm_mem_type_manager *man,
                   amdgpu_gtt_mgr_usage(man) >> 20);
 }
 
                   amdgpu_gtt_mgr_usage(man) >> 20);
 }
 

-const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func = {
-       .init = amdgpu_gtt_mgr_init,
-       .takedown = amdgpu_gtt_mgr_fini,
-       .get_node = amdgpu_gtt_mgr_new,
-       .put_node = amdgpu_gtt_mgr_del,
+static const struct ttm_resource_manager_func amdgpu_gtt_mgr_func = {
+       .alloc = amdgpu_gtt_mgr_new,
+       .free = amdgpu_gtt_mgr_del,

        .debug = amdgpu_gtt_mgr_debug
 };
        .debug = amdgpu_gtt_mgr_debug
 };