diff options
| author | Matthew Auld <matthew.auld@intel.com> | 2021-01-27 13:14:10 +0000 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2021-03-24 19:30:36 +0100 |
| commit | 2dfcc7f4e91ff853beab44ce62eeb1163a220e2f (patch) | |
| tree | 23bcb688bc88525adb4981a39dde6438bf12e421 /drivers/gpu/drm/i915/i915_drv.c | |
| parent | 2913fa4d7d4236f92a0a90810e9f239fe2781131 (diff) | |
| download | linux-stable-2dfcc7f4e91ff853beab44ce62eeb1163a220e2f.tar.gz linux-stable-2dfcc7f4e91ff853beab44ce62eeb1163a220e2f.tar.bz2 linux-stable-2dfcc7f4e91ff853beab44ce62eeb1163a220e2f.zip | |
drm/i915: make local-memory probing a GT operation
Device local memory is very much a GT thing, therefore it should be the
responsibility of the GT to setup the device local memory region.
Suggested-by: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20210127131417.393872-1-matthew.auld@intel.com
[danvet: Rebase conflict.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 43ac73861a4c..a32d847892e0 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -566,6 +566,10 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv) intel_gt_init_hw_early(&dev_priv->gt, &dev_priv->ggtt); + ret = intel_gt_probe_lmem(&dev_priv->gt); + if (ret) + goto err_mem_regions; + ret = i915_ggtt_enable_hw(dev_priv); if (ret) { drm_err(&dev_priv->drm, "failed to enable GGTT\n"); |