Commit 45474ca4 authored by Matt Roper's avatar Matt Roper Committed by Joonas Lahtinen
Browse files

drm/i915: Use managed allocations for extra uncore objects 



We're slowly transitioning the init-time kzalloc's of the driver over to
DRM-managed allocations; let's make sure the uncore objects allocated
for non-root GTs are thus allocated.

Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarRadhakrishna Sripada <radhakrishna.sripada@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220906234934.3655440-4-matthew.d.roper@intel.com


Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent 639e30ee

drivers/gpu/drm/i915/gt/intel_gt.c

+2 −4
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ static int intel_gt_tile_setup(struct intel_gt *gt, phys_addr_t phys_addr) 
	if (!gt_is_root(gt)) {

		struct intel_uncore *uncore;



		uncore = kzalloc(sizeof(*uncore), GFP_KERNEL);

		uncore = drmm_kzalloc(&gt->i915->drm, sizeof(*uncore), GFP_KERNEL);

		if (!uncore)

			return -ENOMEM;
@@ -807,11 +807,9 @@ intel_gt_tile_cleanup(struct intel_gt *gt) 
{

	intel_uncore_cleanup_mmio(gt->uncore);



	if (!gt_is_root(gt)) {

		kfree(gt->uncore);

	if (!gt_is_root(gt))

		kfree(gt);

}

}



int intel_gt_probe_all(struct drm_i915_private *i915)

{