Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64c050db authored by Matthew Auld's avatar Matthew Auld Committed by Joonas Lahtinen
Browse files

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: default avatarMatthew Auld <matthew.auld@intel.com>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1461759565-12086-1-git-send-email-matthew.auld@intel.com
parent a0a6d4ff

drivers/gpu/drm/i915/i915_gem_gtt.c

+16 −9
Original line number Diff line number Diff line
@@ -866,6 +866,7 @@ static void gen8_free_page_tables(struct drm_device *dev, 
static int gen8_init_scratch(struct i915_address_space *vm)

{

	struct drm_device *dev = vm->dev;

	int ret;



	vm->scratch_page = alloc_scratch_page(dev);

	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);

	if (IS_ERR(vm->scratch_pt)) {

		free_scratch_page(dev, vm->scratch_page);

		return PTR_ERR(vm->scratch_pt);

		ret = PTR_ERR(vm->scratch_pt);

		goto free_scratch_page;

	}



	vm->scratch_pd = alloc_pd(dev);

	if (IS_ERR(vm->scratch_pd)) {

		free_pt(dev, vm->scratch_pt);

		free_scratch_page(dev, vm->scratch_page);

		return PTR_ERR(vm->scratch_pd);

		ret = PTR_ERR(vm->scratch_pd);

		goto free_pt;

	}



	if (USES_FULL_48BIT_PPGTT(dev)) {

		vm->scratch_pdp = alloc_pdp(dev);

		if (IS_ERR(vm->scratch_pdp)) {

			free_pd(dev, vm->scratch_pd);

			free_pt(dev, vm->scratch_pt);

			free_scratch_page(dev, vm->scratch_page);

			return PTR_ERR(vm->scratch_pdp);

			ret = PTR_ERR(vm->scratch_pdp);

			goto free_pd;

		}

	}
@@ -900,6 +898,15 @@ static int gen8_init_scratch(struct i915_address_space *vm) 
		gen8_initialize_pdp(vm, vm->scratch_pdp);



	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)