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

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.comSigned-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent 639e30ee
...@@ -782,7 +782,7 @@ static int intel_gt_tile_setup(struct intel_gt *gt, phys_addr_t phys_addr) ...@@ -782,7 +782,7 @@ static int intel_gt_tile_setup(struct intel_gt *gt, phys_addr_t phys_addr)
if (!gt_is_root(gt)) { if (!gt_is_root(gt)) {
struct intel_uncore *uncore; struct intel_uncore *uncore;
uncore = kzalloc(sizeof(*uncore), GFP_KERNEL); uncore = drmm_kzalloc(&gt->i915->drm, sizeof(*uncore), GFP_KERNEL);
if (!uncore) if (!uncore)
return -ENOMEM; return -ENOMEM;
...@@ -807,10 +807,8 @@ intel_gt_tile_cleanup(struct intel_gt *gt) ...@@ -807,10 +807,8 @@ intel_gt_tile_cleanup(struct intel_gt *gt)
{ {
intel_uncore_cleanup_mmio(gt->uncore); intel_uncore_cleanup_mmio(gt->uncore);
if (!gt_is_root(gt)) { if (!gt_is_root(gt))
kfree(gt->uncore);
kfree(gt); kfree(gt);
}
} }
int intel_gt_probe_all(struct drm_i915_private *i915) int intel_gt_probe_all(struct drm_i915_private *i915)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment