Merge branch 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux into drm-next

some more amd/ttm fixes.

* 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux:
  drm/ttm: Downgrade pr_err to pr_debug for memory allocation failures
  drm/ttm: Always and only destroy bo->ttm_resv in ttm_bo_release_list
  drm/amd/amdgpu: Enabling ACP clock in hw_init (v2)
  drm/amdgpu/virt: don't dereference undefined 'module' struct

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index 4d688c8d7853..316f831ad5f0 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -329,7 +329,7 @@ static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
                 pages_to_free = kmalloc(npages_to_free * sizeof(struct page *),
                                         GFP_KERNEL);
         if (!pages_to_free) {
-                pr_err("Failed to allocate memory for pool free operation\n");
+                pr_debug("Failed to allocate memory for pool free operation\n");
                 return 0;
         }
 
@@ -517,7 +517,7 @@ static int ttm_alloc_new_pages(struct list_head *pages, gfp_t gfp_flags,
         caching_array = kmalloc(max_cpages*sizeof(struct page *), GFP_KERNEL);
 
         if (!caching_array) {
-                pr_err("Unable to allocate table for new pages\n");
+                pr_debug("Unable to allocate table for new pages\n");
                 return -ENOMEM;
         }
 
@@ -525,7 +525,7 @@ static int ttm_alloc_new_pages(struct list_head *pages, gfp_t gfp_flags,
                 p = alloc_pages(gfp_flags, order);
 
                 if (!p) {
-                        pr_err("Unable to get page %u\n", i);
+                        pr_debug("Unable to get page %u\n", i);
 
                         /* store already allocated pages in the pool after
                          * setting the caching state */
@@ -625,7 +625,7 @@ static void ttm_page_pool_fill_locked(struct ttm_page_pool *pool, int ttm_flags,
                         ++pool->nrefills;
                         pool->npages += alloc_size;
                 } else {
-                        pr_err("Failed to fill pool (%p)\n", pool);
+                        pr_debug("Failed to fill pool (%p)\n", pool);
                         /* If we have any pages left put them to the pool. */
                         list_for_each_entry(p, &new_pages, lru) {
                                 ++cpages;
@@ -885,8 +885,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
                 while (npages) {
                         p = alloc_page(gfp_flags);
                         if (!p) {
-
-                                pr_err("Unable to allocate page\n");
+                                pr_debug("Unable to allocate page\n");
                                 return -ENOMEM;
                         }
 
@@ -925,7 +924,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
                 /* If there is any pages in the list put them back to
                  * the pool.
                  */
-                pr_err("Failed to allocate extra pages for large request\n");
+                pr_debug("Failed to allocate extra pages for large request\n");
                 ttm_put_pages(pages, count, flags, cstate);
                 return r;
         }