| Message ID | 20220829170238.969875-4-matthew.d.roper@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | i915: Add "standalone media" support for MTL | expand |
> -----Original Message----- > From: Roper, Matthew D <matthew.d.roper@intel.com> > Sent: Monday, August 29, 2022 10:03 AM > To: intel-gfx@lists.freedesktop.org > Cc: dri-devel@lists.freedesktop.org; Sripada, Radhakrishna > <radhakrishna.sripada@intel.com>; Roper, Matthew D > <matthew.d.roper@intel.com> > Subject: [PATCH 3/8] 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. > Reviewed-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> - RK Sripada > Signed-off-by: Matt Roper <matthew.d.roper@intel.com> > --- > drivers/gpu/drm/i915/gt/intel_gt.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c > b/drivers/gpu/drm/i915/gt/intel_gt.c > index a82b5e2e0d83..cf7aab7adb30 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt.c > +++ b/drivers/gpu/drm/i915/gt/intel_gt.c > @@ -783,7 +783,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(>->i915->drm, sizeof(*uncore), > GFP_KERNEL); > if (!uncore) > return -ENOMEM; > > @@ -808,10 +808,8 @@ 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) > -- > 2.37.2
diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c index a82b5e2e0d83..cf7aab7adb30 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt.c +++ b/drivers/gpu/drm/i915/gt/intel_gt.c @@ -783,7 +783,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(>->i915->drm, sizeof(*uncore), GFP_KERNEL); if (!uncore) return -ENOMEM; @@ -808,10 +808,8 @@ 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)
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: Matt Roper <matthew.d.roper@intel.com> --- drivers/gpu/drm/i915/gt/intel_gt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)