@@ -674,8 +674,6 @@ static int gen8_ppgtt_alloc_pagedirs(struct i915_pagedirpo *pdp,
uint64_t start,
uint64_t length)
{
- struct i915_hw_ppgtt *ppgtt =
- container_of(pdp, struct i915_hw_ppgtt, pdp);
struct i915_pagedir *unused;
uint64_t temp;
uint32_t pdpe;
@@ -686,7 +684,7 @@ static int gen8_ppgtt_alloc_pagedirs(struct i915_pagedirpo *pdp,
gen8_for_each_pdpe(unused, pdp, start, length, temp, pdpe) {
BUG_ON(unused);
pdp->pagedir[pdpe] = alloc_pd_single();
- if (IS_ERR(ppgtt->pdp.pagedir[pdpe]))
+ if (IS_ERR(pdp->pagedir[pdpe]))
goto unwind_out;
}
@@ -694,7 +692,7 @@ static int gen8_ppgtt_alloc_pagedirs(struct i915_pagedirpo *pdp,
unwind_out:
while (pdpe--)
- free_pd_single(ppgtt->pdp.pagedir[pdpe]);
+ free_pd_single(pdp->pagedir[pdpe]);
return -ENOMEM;
}