[PATCH 7/7] fixup! drm/i915: Create a dummy object for gen6 ppgtt

Maarten Lankhorst maarten.lankhorst at linux.intel.com
Fri Jul 23 10:03:21 UTC 2021


---
 drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
index fa384d42cfb5..c60327eef862 100644
--- a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
+++ b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
@@ -385,13 +385,8 @@ gen6_alloc_top_pd(struct gen6_ppgtt *ppgtt)
 {
 	struct i915_ggtt * const ggtt = ppgtt->base.vm.gt->ggtt;
 	struct i915_page_directory *pd;
-	const struct i915_ggtt_view view = {
-	      .type = I915_GGTT_VIEW_ROTATED, /* prevent fencing */
-	};
 	int err;
 
-	GEM_BUG_ON(I915_PDES);
-
 	pd = __alloc_pd(I915_PDES);
 	if (unlikely(!pd))
 		return ERR_PTR(-ENOMEM);
@@ -406,7 +401,7 @@ gen6_alloc_top_pd(struct gen6_ppgtt *ppgtt)
 	pd->pt.base->base.resv = i915_vm_resv_get(&ppgtt->base.vm);
 	pd->pt.base->shares_resv_from = &ppgtt->base.vm;
 
-	ppgtt->vma = i915_vma_instance(pd->pt.base, &ggtt->vm, &view);
+	ppgtt->vma = i915_vma_instance(pd->pt.base, &ggtt->vm, NULL);
 	if (IS_ERR(ppgtt->vma)) {
 		err = PTR_ERR(ppgtt->vma);
 		ppgtt->vma = NULL;
-- 
2.31.0



More information about the Intel-gfx-trybot mailing list