Merge tag 'drm-intel-gt-next-2023-08-04' of git://anongit.freedesktop.org/drm/drm...

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / i915_gpu_error.c

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 4749f99..4008bb0 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -187,64 +187,64 @@ i915_error_printer(struct drm_i915_error_state_buf *e)
 }
 
 /* single threaded page allocator with a reserved stash for emergencies */
-static void pool_fini(struct pagevec *pv)
+static void pool_fini(struct folio_batch *fbatch)
 {
-       pagevec_release(pv);
+       folio_batch_release(fbatch);
 }
 
-static int pool_refill(struct pagevec *pv, gfp_t gfp)
+static int pool_refill(struct folio_batch *fbatch, gfp_t gfp)
 {
-       while (pagevec_space(pv)) {
-               struct page *p;
+       while (folio_batch_space(fbatch)) {
+               struct folio *folio;
 
-               p = alloc_page(gfp);
-               if (!p)
+               folio = folio_alloc(gfp, 0);
+               if (!folio)
                        return -ENOMEM;
 
-               pagevec_add(pv, p);
+               folio_batch_add(fbatch, folio);
        }
 
        return 0;
 }
 
-static int pool_init(struct pagevec *pv, gfp_t gfp)
+static int pool_init(struct folio_batch *fbatch, gfp_t gfp)
 {
        int err;
 
-       pagevec_init(pv);
+       folio_batch_init(fbatch);
 
-       err = pool_refill(pv, gfp);
+       err = pool_refill(fbatch, gfp);
        if (err)
-               pool_fini(pv);
+               pool_fini(fbatch);
 
        return err;
 }
 
-static void *pool_alloc(struct pagevec *pv, gfp_t gfp)
+static void *pool_alloc(struct folio_batch *fbatch, gfp_t gfp)
 {
-       struct page *p;
+       struct folio *folio;
 
-       p = alloc_page(gfp);
-       if (!p && pagevec_count(pv))
-               p = pv->pages[--pv->nr];
+       folio = folio_alloc(gfp, 0);
+       if (!folio && folio_batch_count(fbatch))
+               folio = fbatch->folios[--fbatch->nr];
 
-       return p ? page_address(p) : NULL;
+       return folio ? folio_address(folio) : NULL;
 }
 
-static void pool_free(struct pagevec *pv, void *addr)
+static void pool_free(struct folio_batch *fbatch, void *addr)
 {
-       struct page *p = virt_to_page(addr);
+       struct folio *folio = virt_to_folio(addr);
 
-       if (pagevec_space(pv))
-               pagevec_add(pv, p);
+       if (folio_batch_space(fbatch))
+               folio_batch_add(fbatch, folio);
        else
-               __free_page(p);
+               folio_put(folio);
 }
 
 #ifdef CONFIG_DRM_I915_COMPRESS_ERROR
 
 struct i915_vma_compress {
-       struct pagevec pool;
+       struct folio_batch pool;
        struct z_stream_s zstream;
        void *tmp;
 };
@@ -381,7 +381,7 @@ static void err_compression_marker(struct drm_i915_error_state_buf *m)
 #else
 
 struct i915_vma_compress {
-       struct pagevec pool;
+       struct folio_batch pool;
 };
 
 static bool compress_init(struct i915_vma_compress *c)
@@ -649,6 +649,8 @@ static void err_print_capabilities(struct drm_i915_error_state_buf *m,
        struct drm_printer p = i915_error_printer(m);
 
        intel_device_info_print(&error->device_info, &error->runtime_info, &p);
+       intel_display_device_info_print(&error->display_device_info,
+                                       &error->display_runtime_info, &p);
        intel_driver_caps_print(&error->driver_caps, &p);
 }
 
@@ -1983,6 +1985,10 @@ static void capture_gen(struct i915_gpu_coredump *error)
        memcpy(&error->runtime_info,
               RUNTIME_INFO(i915),
               sizeof(error->runtime_info));
+       memcpy(&error->display_device_info, DISPLAY_INFO(i915),
+              sizeof(error->display_device_info));
+       memcpy(&error->display_runtime_info, DISPLAY_RUNTIME_INFO(i915),
+              sizeof(error->display_runtime_info));
        error->driver_caps = i915->caps;
 }