evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/i915: Extract PPGTT param from page_directory alloc

Browse source 
This will be useful for when we move to 48b addressing, and the PDP isn't
the root of the page table structure.

v2: Rebase after changes for Gen8+ systems with less than 4GB of memory.
v3: Rebase after Mika's code review.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Michel Thierry <michel.thierry@intel.com> (v2)
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Michel Thierry 2015-04-08 12:13:31 +01:00 • committed by Daniel Vetter
parent 09942c656b
commit c488dbbaa7
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/gpu/drm/i915/i915_gem_gtt.c
View file

@ -716,12 +716,11 @@ unwind_out:
return -ENOMEM; return -ENOMEM;
} }
static int gen8_ppgtt_alloc_page_directories(struct i915_page_directory_pointer *pdp, static int gen8_ppgtt_alloc_page_directories(struct i915_hw_ppgtt *ppgtt,
struct i915_page_directory_pointer *pdp,
uint64_t start, uint64_t start,
uint64_t length) uint64_t length)
{ {
struct i915_hw_ppgtt *ppgtt =
container_of(pdp, struct i915_hw_ppgtt, pdp);
struct i915_page_directory *unused; struct i915_page_directory *unused;
uint64_t temp; uint64_t temp;
uint32_t pdpe; uint32_t pdpe;
@ -732,7 +731,7 @@ static int gen8_ppgtt_alloc_page_directories(struct i915_page_directory_pointer
gen8_for_each_pdpe(unused, pdp, start, length, temp, pdpe) { gen8_for_each_pdpe(unused, pdp, start, length, temp, pdpe) {
WARN_ON(unused); WARN_ON(unused);
pdp->page_directory[pdpe] = alloc_pd_single(); pdp->page_directory[pdpe] = alloc_pd_single();
if (IS_ERR(ppgtt->pdp.page_directory[pdpe])) if (IS_ERR(pdp->page_directory[pdpe]))
goto unwind_out; goto unwind_out;
gen8_initialize_pd(&ppgtt->base, gen8_initialize_pd(&ppgtt->base,
@ -743,8 +742,8 @@ static int gen8_ppgtt_alloc_page_directories(struct i915_page_directory_pointer
* 4GB of memory. This won't be needed after a subsequent patch. * 4GB of memory. This won't be needed after a subsequent patch.
*/ */
while (pdpe < GEN8_LEGACY_PDPES) { while (pdpe < GEN8_LEGACY_PDPES) {
ppgtt->pdp.page_directory[pdpe] = alloc_pd_single(); pdp->page_directory[pdpe] = alloc_pd_single();
if (IS_ERR(ppgtt->pdp.page_directory[pdpe])) if (IS_ERR(pdp->page_directory[pdpe]))
goto unwind_out; goto unwind_out;
gen8_initialize_pd(&ppgtt->base, gen8_initialize_pd(&ppgtt->base,
@ -756,7 +755,7 @@ static int gen8_ppgtt_alloc_page_directories(struct i915_page_directory_pointer
unwind_out: unwind_out:
while (pdpe--) while (pdpe--)
unmap_and_free_pd(ppgtt->pdp.page_directory[pdpe]); unmap_and_free_pd(pdp->page_directory[pdpe]);
return -ENOMEM; return -ENOMEM;
} }
@ -770,7 +769,7 @@ static int gen8_ppgtt_alloc(struct i915_hw_ppgtt *ppgtt,
uint32_t pdpe; uint32_t pdpe;
int ret; int ret;
ret = gen8_ppgtt_alloc_page_directories(&ppgtt->pdp, start, length); ret = gen8_ppgtt_alloc_page_directories(ppgtt, &ppgtt->pdp, start, length);
if (ret) if (ret)
return ret; return ret;