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

Commit 46f1e8b3 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Joonas Lahtinen
Browse files

drm/i915: Move intel_guc_wopcm_size to intel_guc.c 



Function intel_guc_wopcm_size didn't fit well in the old place.
With this move upcoming cleanup will be simpler.

Suggested-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171016144724.17244-2-michal.wajdeczko@intel.com
parent 1fd51d9d

drivers/gpu/drm/i915/intel_guc.c

+11 −0
Original line number Diff line number Diff line
@@ -263,3 +263,14 @@ struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size) 
	i915_gem_object_put(obj);

	return vma;

}



u32 intel_guc_wopcm_size(struct drm_i915_private *dev_priv)

{

	u32 wopcm_size = GUC_WOPCM_TOP;



	/* On BXT, the top of WOPCM is reserved for RC6 context */

	if (IS_GEN9_LP(dev_priv))

		wopcm_size -= BXT_GUC_WOPCM_RC6_RESERVED;



	return wopcm_size;

}

drivers/gpu/drm/i915/intel_guc_loader.c

+0 −11
Original line number Diff line number Diff line
@@ -250,17 +250,6 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv, 
	return ret;

}



u32 intel_guc_wopcm_size(struct drm_i915_private *dev_priv)

{

	u32 wopcm_size = GUC_WOPCM_TOP;



	/* On BXT, the top of WOPCM is reserved for RC6 context */

	if (IS_GEN9_LP(dev_priv))

		wopcm_size -= BXT_GUC_WOPCM_RC6_RESERVED;



	return wopcm_size;

}



/*

 * Load the GuC firmware blob into the MinuteIA.

 */