Commit d158367c authored by Nirmoy Das's avatar Nirmoy Das Committed by Matthew Auld

drm/i915: return -EIO on lmem setup failure

Caller of setup_lmem() ignores -ENODEV but failing
to setup lmem on dGPU isn't ignorable error.
Signed-off-by: default avatarNirmoy Das <nirmoy.das@intel.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220511153746.14142-1-nirmoy.das@intel.com
parent ca10b9d6
...@@ -108,7 +108,7 @@ static struct intel_memory_region *setup_lmem(struct intel_gt *gt) ...@@ -108,7 +108,7 @@ static struct intel_memory_region *setup_lmem(struct intel_gt *gt)
flat_ccs_base = (flat_ccs_base >> XEHPSDV_CCS_BASE_SHIFT) * SZ_64K; flat_ccs_base = (flat_ccs_base >> XEHPSDV_CCS_BASE_SHIFT) * SZ_64K;
if (GEM_WARN_ON(lmem_size < flat_ccs_base)) if (GEM_WARN_ON(lmem_size < flat_ccs_base))
return ERR_PTR(-ENODEV); return ERR_PTR(-EIO);
tile_stolen = lmem_size - flat_ccs_base; tile_stolen = lmem_size - flat_ccs_base;
...@@ -131,7 +131,7 @@ static struct intel_memory_region *setup_lmem(struct intel_gt *gt) ...@@ -131,7 +131,7 @@ static struct intel_memory_region *setup_lmem(struct intel_gt *gt)
io_start = pci_resource_start(pdev, 2); io_start = pci_resource_start(pdev, 2);
io_size = min(pci_resource_len(pdev, 2), lmem_size); io_size = min(pci_resource_len(pdev, 2), lmem_size);
if (!io_size) if (!io_size)
return ERR_PTR(-ENODEV); return ERR_PTR(-EIO);
min_page_size = HAS_64K_PAGES(i915) ? I915_GTT_PAGE_SIZE_64K : min_page_size = HAS_64K_PAGES(i915) ? I915_GTT_PAGE_SIZE_64K :
I915_GTT_PAGE_SIZE_4K; I915_GTT_PAGE_SIZE_4K;
......
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