openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: tidy up gen8_init_scratch 

Prefer a goto teardown path to do all the required cleanup.

v2:
(Joonas Lahtinen)
  - remove NULL assignments
  - rename goto labels

Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Dave Gordon <david.s.gordon@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1461759565-12086-1-git-send-email-matthew.auld@intel.com
This commit is contained in:
Matthew Auld 2016-04-27 13:19:25 +01:00 committed by Joonas Lahtinen
parent a0a6d4ffd2
commit 64c050dbae
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/gpu/drm/i915/i915_gem_gtt.c
View File

@ -866,6 +866,7 @@ static void gen8_free_page_tables(struct drm_device *dev,
static int gen8_init_scratch(struct i915_address_space *vm) static int gen8_init_scratch(struct i915_address_space *vm)
{ {
struct drm_device *dev = vm->dev; struct drm_device *dev = vm->dev;
int ret;
vm->scratch_page = alloc_scratch_page(dev); vm->scratch_page = alloc_scratch_page(dev);
if (IS_ERR(vm->scratch_page)) if (IS_ERR(vm->scratch_page))
@ -873,24 +874,21 @@ static int gen8_init_scratch(struct i915_address_space *vm)
vm->scratch_pt = alloc_pt(dev); vm->scratch_pt = alloc_pt(dev);
if (IS_ERR(vm->scratch_pt)) { if (IS_ERR(vm->scratch_pt)) {
free_scratch_page(dev, vm->scratch_page); ret = PTR_ERR(vm->scratch_pt);
return PTR_ERR(vm->scratch_pt); goto free_scratch_page;
} }
vm->scratch_pd = alloc_pd(dev); vm->scratch_pd = alloc_pd(dev);
if (IS_ERR(vm->scratch_pd)) { if (IS_ERR(vm->scratch_pd)) {
free_pt(dev, vm->scratch_pt); ret = PTR_ERR(vm->scratch_pd);
free_scratch_page(dev, vm->scratch_page); goto free_pt;
return PTR_ERR(vm->scratch_pd);
} }
if (USES_FULL_48BIT_PPGTT(dev)) { if (USES_FULL_48BIT_PPGTT(dev)) {
vm->scratch_pdp = alloc_pdp(dev); vm->scratch_pdp = alloc_pdp(dev);
if (IS_ERR(vm->scratch_pdp)) { if (IS_ERR(vm->scratch_pdp)) {
free_pd(dev, vm->scratch_pd); ret = PTR_ERR(vm->scratch_pdp);
free_pt(dev, vm->scratch_pt); goto free_pd;
free_scratch_page(dev, vm->scratch_page);
return PTR_ERR(vm->scratch_pdp);
} }
} }
@ -900,6 +898,15 @@ static int gen8_init_scratch(struct i915_address_space *vm)
gen8_initialize_pdp(vm, vm->scratch_pdp); gen8_initialize_pdp(vm, vm->scratch_pdp);
return 0; return 0;
free_pd:
free_pd(dev, vm->scratch_pd);
free_pt:
free_pt(dev, vm->scratch_pt);
free_scratch_page:
free_scratch_page(dev, vm->scratch_page);
return ret;
} }
static int gen8_ppgtt_notify_vgt(struct i915_hw_ppgtt *ppgtt, bool create) static int gen8_ppgtt_notify_vgt(struct i915_hw_ppgtt *ppgtt, bool create)