From: Lucas De Marchi <lucas.demarchi@intel.com> To: intel-gfx@lists.freedesktop.org Subject: [PATCH 2/2] drm/i915/dsb: fix extra warning on error path handling Date: Mon, 11 Nov 2019 12:50:25 -0800 [thread overview] Message-ID: <20191111205024.22853-3-lucas.demarchi@intel.com> (raw) In-Reply-To: <20191111205024.22853-1-lucas.demarchi@intel.com> 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> --- drivers/gpu/drm/i915/display/intel_dsb.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c b/drivers/gpu/drm/i915/display/intel_dsb.c index 4feebbeb0b0c..858af6be9c36 100644 --- a/drivers/gpu/drm/i915/display/intel_dsb.c +++ b/drivers/gpu/drm/i915/display/intel_dsb.c @@ -102,6 +102,7 @@ intel_dsb_get(struct intel_crtc *crtc) struct intel_dsb *dsb = &crtc->dsb; struct drm_i915_gem_object *obj; struct i915_vma *vma; + u32 *buf; intel_wakeref_t wakeref; if (!HAS_DSB(i915)) @@ -110,7 +111,6 @@ intel_dsb_get(struct intel_crtc *crtc) if (++dsb->refcount != 1) return dsb; - dsb->id = DSB1; wakeref = intel_runtime_pm_get(&i915->runtime_pm); 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)) { DRM_ERROR("Vma creation failed\n"); i915_gem_object_put(obj); - dsb->refcount--; goto err; } - dsb->cmd_buf = i915_gem_object_pin_map(vma->obj, I915_MAP_WC); - if (IS_ERR(dsb->cmd_buf)) { + buf = i915_gem_object_pin_map(vma->obj, I915_MAP_WC); + if (IS_ERR(buf)) { DRM_ERROR("Command buffer creation failed\n"); - i915_vma_unpin_and_release(&vma, 0); - dsb->cmd_buf = NULL; - dsb->refcount--; goto err; } + + dsb->id = DSB1; dsb->vma = vma; + dsb->cmd_buf = buf; 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); + return dsb; } -- 2.24.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Lucas De Marchi <lucas.demarchi@intel.com> To: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 2/2] drm/i915/dsb: fix extra warning on error path handling Date: Mon, 11 Nov 2019 12:50:25 -0800 [thread overview] Message-ID: <20191111205024.22853-3-lucas.demarchi@intel.com> (raw) Message-ID: <20191111205025.COKHJPTtF0rFpwB9Q1cJvwowNS_AQsVyiUbyFvn2yjc@z> (raw) In-Reply-To: <20191111205024.22853-1-lucas.demarchi@intel.com> 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> --- drivers/gpu/drm/i915/display/intel_dsb.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c b/drivers/gpu/drm/i915/display/intel_dsb.c index 4feebbeb0b0c..858af6be9c36 100644 --- a/drivers/gpu/drm/i915/display/intel_dsb.c +++ b/drivers/gpu/drm/i915/display/intel_dsb.c @@ -102,6 +102,7 @@ intel_dsb_get(struct intel_crtc *crtc) struct intel_dsb *dsb = &crtc->dsb; struct drm_i915_gem_object *obj; struct i915_vma *vma; + u32 *buf; intel_wakeref_t wakeref; if (!HAS_DSB(i915)) @@ -110,7 +111,6 @@ intel_dsb_get(struct intel_crtc *crtc) if (++dsb->refcount != 1) return dsb; - dsb->id = DSB1; wakeref = intel_runtime_pm_get(&i915->runtime_pm); 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)) { DRM_ERROR("Vma creation failed\n"); i915_gem_object_put(obj); - dsb->refcount--; goto err; } - dsb->cmd_buf = i915_gem_object_pin_map(vma->obj, I915_MAP_WC); - if (IS_ERR(dsb->cmd_buf)) { + buf = i915_gem_object_pin_map(vma->obj, I915_MAP_WC); + if (IS_ERR(buf)) { DRM_ERROR("Command buffer creation failed\n"); - i915_vma_unpin_and_release(&vma, 0); - dsb->cmd_buf = NULL; - dsb->refcount--; goto err; } + + dsb->id = DSB1; dsb->vma = vma; + dsb->cmd_buf = buf; 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); + return dsb; } -- 2.24.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-11-11 20:50 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-11 20:50 [PATCH 0/2] Improve error handling on DSB Lucas De Marchi 2019-11-11 20:50 ` [Intel-gfx] " Lucas De Marchi 2019-11-11 20:50 ` [PATCH 1/2] drm/i915/dsb: remove atomic operations Lucas De Marchi 2019-11-11 20:50 ` [Intel-gfx] " Lucas De Marchi 2019-11-15 20:29 ` Matt Roper 2019-11-15 20:29 ` [Intel-gfx] " Matt Roper 2019-11-15 21:09 ` Ville Syrjälä 2019-11-15 21:09 ` [Intel-gfx] " Ville Syrjälä 2019-11-15 23:01 ` Lucas De Marchi 2019-11-15 23:01 ` [Intel-gfx] " Lucas De Marchi 2019-11-16 1:15 ` [PATCH v2] " Lucas De Marchi 2019-11-16 1:15 ` [Intel-gfx] " Lucas De Marchi 2019-11-11 20:50 ` Lucas De Marchi [this message] 2019-11-11 20:50 ` [Intel-gfx] [PATCH 2/2] drm/i915/dsb: fix extra warning on error path handling Lucas De Marchi 2019-11-15 20:52 ` Matt Roper 2019-11-15 20:52 ` [Intel-gfx] " Matt Roper 2019-11-15 23:04 ` Lucas De Marchi 2019-11-15 23:04 ` [Intel-gfx] " Lucas De Marchi 2019-11-18 16:07 ` Jani Nikula 2019-11-18 16:07 ` [Intel-gfx] " Jani Nikula 2019-11-11 22:13 ` ✓ Fi.CI.BAT: success for Improve error handling on DSB Patchwork 2019-11-11 22:13 ` [Intel-gfx] " Patchwork 2019-11-12 9:16 ` ✗ Fi.CI.IGT: failure " Patchwork 2019-11-12 9:16 ` [Intel-gfx] " Patchwork 2019-11-15 2:35 ` ✓ Fi.CI.BAT: success for Improve error handling on DSB (rev2) Patchwork 2019-11-15 2:35 ` [Intel-gfx] " Patchwork 2019-11-16 2:40 ` ✓ Fi.CI.BAT: success for Improve error handling on DSB (rev3) Patchwork 2019-11-16 2:40 ` [Intel-gfx] " Patchwork 2019-11-16 11:05 ` ✗ Fi.CI.IGT: failure for Improve error handling on DSB (rev2) Patchwork 2019-11-16 11:05 ` [Intel-gfx] " Patchwork 2019-11-16 16:47 ` ✓ Fi.CI.BAT: success for Improve error handling on DSB (rev4) Patchwork 2019-11-16 16:47 ` [Intel-gfx] " Patchwork 2019-11-17 22:59 ` ✓ Fi.CI.IGT: " Patchwork 2019-11-17 22:59 ` [Intel-gfx] " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191111205024.22853-3-lucas.demarchi@intel.com \ --to=lucas.demarchi@intel.com \ --cc=intel-gfx@lists.freedesktop.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.