niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/i915/dsb: fix extra warning on error path handling

Browse source 
When we call intel_dsb_get(), the dsb initialization may fail for
various reasons. We already log the error message in that path, making
it unnecessary to trigger a warning that refcount == 0 when calling
intel_dsb_put().

So here we simplify the logic and do lazy shutdown: leaving the extra
refcount alive so when we call intel_dsb_put() we end up calling
i915_vma_unpin_and_release().

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191111205024.22853-3-lucas.demarchi@intel.com
This commit is contained in:
Lucas De Marchi 2019-11-11 12:50:25 -08:00
parent ac4eead379
commit 03cea61076
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/gpu/drm/i915/display/intel_dsb.c
View file

@ -102,6 +102,7 @@ intel_dsb_get(struct intel_crtc *crtc)
struct intel_dsb *dsb = &crtc->dsb; struct intel_dsb *dsb = &crtc->dsb;
struct drm_i915_gem_object *obj; struct drm_i915_gem_object *obj;
struct i915_vma *vma; struct i915_vma *vma;
u32 *buf;
intel_wakeref_t wakeref; intel_wakeref_t wakeref;
if (!HAS_DSB(i915)) if (!HAS_DSB(i915))
@ -110,7 +111,6 @@ intel_dsb_get(struct intel_crtc *crtc)
if (dsb->refcount++ != 0) if (dsb->refcount++ != 0)
return dsb; return dsb;
dsb->id = DSB1;
wakeref = intel_runtime_pm_get(&i915->runtime_pm); wakeref = intel_runtime_pm_get(&i915->runtime_pm);
obj = i915_gem_object_create_internal(i915, DSB_BUF_SIZE); obj = i915_gem_object_create_internal(i915, DSB_BUF_SIZE);
@ -123,22 +123,29 @@ intel_dsb_get(struct intel_crtc *crtc)
if (IS_ERR(vma)) { if (IS_ERR(vma)) {
DRM_ERROR("Vma creation failed\n"); DRM_ERROR("Vma creation failed\n");
i915_gem_object_put(obj); i915_gem_object_put(obj);
dsb->refcount--;
goto err; goto err;
} }
dsb->cmd_buf = i915_gem_object_pin_map(vma->obj, I915_MAP_WC); buf = i915_gem_object_pin_map(vma->obj, I915_MAP_WC);
if (IS_ERR(dsb->cmd_buf)) { if (IS_ERR(buf)) {
DRM_ERROR("Command buffer creation failed\n"); DRM_ERROR("Command buffer creation failed\n");
i915_vma_unpin_and_release(&vma, 0);
dsb->cmd_buf = NULL;
dsb->refcount--;
goto err; goto err;
} }
dsb->id = DSB1;
dsb->vma = vma; dsb->vma = vma;
dsb->cmd_buf = buf;
err: err:
/*
* Set cmd_buf to NULL so the writes pass-through, but leave the
* dangling refcount to be removed later by the corresponding
* intel_dsb_put(): the important error message will already be
* logged above.
*/
dsb->cmd_buf = NULL;
intel_runtime_pm_put(&i915->runtime_pm, wakeref); intel_runtime_pm_put(&i915->runtime_pm, wakeref);
return dsb; return dsb;
} }