diff options
| author |   Matthew Auld <matthew.auld@intel.com> | 2019-11-06 12:31:35 +0000 |
|---|---|---|
| committer |   Chris Wilson <chris@chris-wilson.co.uk> | 2019-11-06 14:34:10 +0000 |
| commit | cddb85dc1eca10300eb23873f6d9e84267aabd9d (patch) | |
| tree | 774dd279b8e84980628de14409684ca191e02df3 | |
| parent | drm/i915: Frob the correct crtc state in intel_crtc_disable_noatomic() (diff) | |
| download | wireguard-linux-cddb85dc1eca10300eb23873f6d9e84267aabd9d.tar.xz wireguard-linux-cddb85dc1eca10300eb23873f6d9e84267aabd9d.zip | |
drm/i915/lmem: fixup fake lmem teardown
We should not be unconditionally calling release_fake_lmem_bar.
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
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/20191106123135.12441-1-matthew.auld@intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/intel_region_lmem.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_region_lmem.c b/drivers/gpu/drm/i915/intel_region_lmem.c index 583118095635..eddb392917aa 100644 --- a/drivers/gpu/drm/i915/intel_region_lmem.c +++ b/drivers/gpu/drm/i915/intel_region_lmem.c @@ -51,8 +51,10 @@ static int init_fake_lmem_bar(struct intel_memory_region *mem) static void release_fake_lmem_bar(struct intel_memory_region *mem) { - if (drm_mm_node_allocated(&mem->fake_mappable)) - drm_mm_remove_node(&mem->fake_mappable); + if (!drm_mm_node_allocated(&mem->fake_mappable)) + return; + + drm_mm_remove_node(&mem->fake_mappable); dma_unmap_resource(&mem->i915->drm.pdev->dev, mem->remap_addr, |