[v3,01/21] drm/i915/stolen: make the object creation interface consistent

Message ID	20191004170452.15410-2-matthew.auld@intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=xPPx=X5=lists.freedesktop.org=intel-gfx-bounces@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8EB9C20862 From: Matthew Auld <matthew.auld@intel.com> To: intel-gfx@lists.freedesktop.org Date: Fri, 4 Oct 2019 18:04:32 +0100 Message-Id: <20191004170452.15410-2-matthew.auld@intel.com> In-Reply-To: <20191004170452.15410-1-matthew.auld@intel.com> References: <20191004170452.15410-1-matthew.auld@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v3 01/21] drm/i915/stolen: make the object creation interface consistent Precedence: list Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
Series	LMEM basics \| expand [v3,00/21] LMEM basics [v3,01/21] drm/i915/stolen: make the object creation interface consistent [v3,02/21] drm/i915: introduce intel_memory_region [v3,03/21] drm/i915/region: support contiguous allocations [v3,04/21] drm/i915/region: support volatile objects [v3,05/21] drm/i915: Add memory region information to device_info [v3,06/21] drm/i915: support creating LMEM objects [v3,07/21] drm/i915: setup io-mapping for LMEM [v3,08/21] drm/i915/lmem: support kernel mapping [v3,09/21] drm/i915/selftests: add write-dword test for LMEM [v3,10/21] drm/i915/selftests: extend coverage to include LMEM huge-pages [v3,11/21] drm/i915: enumerate and init each supported region [v3,12/21] drm/i915: treat shmem as a region [v3,13/21] drm/i915: treat stolen as a region [v3,14/21] drm/i915: define i915_ggtt_has_aperture [v3,15/21] drm/i915: do not map aperture if it is not available. [v3,16/21] drm/i915: set num_fence_regs to 0 if there is no aperture [v3,17/21] drm/i915: error capture with no ggtt slot [v3,18/21] drm/i915: Don't try to place HWS in non-existing mappable region [v3,19/21] drm/i915: don't allocate the ring in stolen if we lack aperture [v3,20/21] drm/i915/selftests: check for missing aperture [v3,21/21] HAX drm/i915: add the fake lmem region

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 5acc39f32d0c..c15975a410bc 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -3066,7 +3066,7 @@ intel_alloc_initial_plane_obj(struct intel_crtc *crtc, base_aligned, base_aligned, size_aligned); - if (!obj) + if (IS_ERR(obj)) return false; switch (plane_config->tiling) { diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c index 97cde017670a..3d1061470e76 100644 --- a/drivers/gpu/drm/i915/display/intel_fbdev.c +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c @@ -141,10 +141,10 @@ static int intelfb_alloc(struct drm_fb_helper *helper, /* If the FB is too big, just don't use it since fbdev is not very * important and we should probably use that space with FBC or other * features. */ - obj = NULL; + obj = ERR_PTR(-ENODEV); if (size * 2 < dev_priv->stolen_usable_size) obj = i915_gem_object_create_stolen(dev_priv, size); - if (obj == NULL) + if (IS_ERR(obj)) obj = i915_gem_object_create_shmem(dev_priv, size); if (IS_ERR(obj)) { DRM_ERROR("failed to allocate framebuffer\n"); diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c index daea112cbb87..2360f19f9694 100644 --- a/drivers/gpu/drm/i915/display/intel_overlay.c +++ b/drivers/gpu/drm/i915/display/intel_overlay.c @@ -1291,7 +1291,7 @@ static int get_registers(struct intel_overlay *overlay, bool use_phys) int err; obj = i915_gem_object_create_stolen(i915, PAGE_SIZE); - if (obj == NULL) + if (IS_ERR(obj)) obj = i915_gem_object_create_internal(i915, PAGE_SIZE); if (IS_ERR(obj)) return PTR_ERR(obj); diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c index fad98a921cde..2a34355b738f 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c @@ -585,28 +585,32 @@ i915_gem_object_create_stolen(struct drm_i915_private *dev_priv, int ret; if (!drm_mm_initialized(&dev_priv->mm.stolen)) - return NULL; + return ERR_PTR(-ENODEV); if (size == 0) - return NULL; + return ERR_PTR(-EINVAL); stolen = kzalloc(sizeof(*stolen), GFP_KERNEL); if (!stolen) - return NULL; + return ERR_PTR(-ENOMEM); ret = i915_gem_stolen_insert_node(dev_priv, stolen, size, 4096); - if (ret) { - kfree(stolen); - return NULL; - } + if (ret) + goto err_free; obj = _i915_gem_object_create_stolen(dev_priv, stolen); - if (obj) - return obj; + if (obj == NULL) { + ret = -ENOMEM; + goto err_remove; + } + return obj; + +err_remove: i915_gem_stolen_remove_node(dev_priv, stolen); +err_free: kfree(stolen); - return NULL; + return ERR_PTR(ret); } struct drm_i915_gem_object * @@ -622,7 +626,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_priv int ret; if (!drm_mm_initialized(&dev_priv->mm.stolen)) - return NULL; + return ERR_PTR(-ENODEV); DRM_DEBUG_DRIVER("creating preallocated stolen object: stolen_offset=%pa, gtt_offset=%pa, size=%pa\n", &stolen_offset, &gtt_offset, &size); @@ -631,11 +635,11 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_priv if (WARN_ON(size == 0) || WARN_ON(!IS_ALIGNED(size, I915_GTT_PAGE_SIZE)) || WARN_ON(!IS_ALIGNED(stolen_offset, I915_GTT_MIN_ALIGNMENT))) - return NULL; + return ERR_PTR(-EINVAL); stolen = kzalloc(sizeof(*stolen), GFP_KERNEL); if (!stolen) - return NULL; + return ERR_PTR(-ENOMEM); stolen->start = stolen_offset; stolen->size = size; @@ -645,7 +649,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_priv if (ret) { DRM_DEBUG_DRIVER("failed to allocate stolen space\n"); kfree(stolen); - return NULL; + return ERR_PTR(ret); } obj = _i915_gem_object_create_stolen(dev_priv, stolen); @@ -653,7 +657,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_priv DRM_DEBUG_DRIVER("failed to allocate stolen object\n"); i915_gem_stolen_remove_node(dev_priv, stolen); kfree(stolen); - return NULL; + return ERR_PTR(-ENOMEM); } /* Some objects just need physical mem from stolen space */ @@ -706,5 +710,5 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_priv i915_gem_object_unpin_pages(obj); err: i915_gem_object_put(obj); - return NULL; + return ERR_PTR(ret); } diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c index 53220741e49e..8f44cf8c79b2 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt.c +++ b/drivers/gpu/drm/i915/gt/intel_gt.c @@ -334,7 +334,7 @@ static int intel_gt_init_scratch(struct intel_gt *gt, unsigned int size) int ret; obj = i915_gem_object_create_stolen(i915, size); - if (!obj) + if (IS_ERR(obj)) obj = i915_gem_object_create_internal(i915, size); if (IS_ERR(obj)) { DRM_ERROR("Failed to allocate scratch page\n"); diff --git a/drivers/gpu/drm/i915/gt/intel_rc6.c b/drivers/gpu/drm/i915/gt/intel_rc6.c index d6167dd592e9..71184aa72896 100644 --- a/drivers/gpu/drm/i915/gt/intel_rc6.c +++ b/drivers/gpu/drm/i915/gt/intel_rc6.c @@ -299,8 +299,8 @@ static int vlv_rc6_init(struct intel_rc6 *rc6) pcbr_offset, I915_GTT_OFFSET_NONE, pctx_size); - if (!pctx) - return -ENOMEM; + if (IS_ERR(pctx)) + return PTR_ERR(pctx); goto out; } @@ -316,9 +316,9 @@ static int vlv_rc6_init(struct intel_rc6 *rc6) * memory, or any other relevant ranges. */ pctx = i915_gem_object_create_stolen(i915, pctx_size); - if (!pctx) { + if (IS_ERR(pctx)) { DRM_DEBUG("not enough stolen space for PCTX, disabling\n"); - return -ENOMEM; + return PTR_ERR(pctx); } GEM_BUG_ON(range_overflows_t(u64, diff --git a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c index ec32996254c0..311fdc0a21bc 100644 --- a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c @@ -1274,7 +1274,7 @@ static struct i915_vma *create_ring_vma(struct i915_ggtt *ggtt, int size) struct i915_vma *vma; obj = i915_gem_object_create_stolen(i915, size); - if (!obj) + if (IS_ERR(obj)) obj = i915_gem_object_create_internal(i915, size); if (IS_ERR(obj)) return ERR_CAST(obj);

[v3,01/21] drm/i915/stolen: make the object creation interface consistent

Commit Message

Patch