From: Daniel Vetter <daniel@ffwll.ch>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 13/13] drm/i915/wopcm: convert to drm device based logging
Date: Wed, 25 Mar 2020 10:10:22 +0100 [thread overview]
Message-ID: <20200325091022.GY2363188@phenom.ffwll.local> (raw)
In-Reply-To: <017d9bdc171481da13ba9492492625fc6878844d.1584714939.git.jani.nikula@intel.com>
On Fri, Mar 20, 2020 at 04:36:38PM +0200, Jani Nikula wrote:
> Prefer drm_dbg() over DRM_DEV_DEBUG_DRIVER() and drm_err() over
> dev_err().
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/intel_wopcm.c | 22 ++++++++++------------
> 1 file changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_wopcm.c b/drivers/gpu/drm/i915/intel_wopcm.c
> index 2bb9f9f9a50a..2186386a45c8 100644
> --- a/drivers/gpu/drm/i915/intel_wopcm.c
> +++ b/drivers/gpu/drm/i915/intel_wopcm.c
> @@ -86,7 +86,7 @@ void intel_wopcm_init_early(struct intel_wopcm *wopcm)
> else
> wopcm->size = GEN9_WOPCM_SIZE;
>
> - DRM_DEV_DEBUG_DRIVER(i915->drm.dev, "WOPCM: %uK\n", wopcm->size / 1024);
> + drm_dbg(&i915->drm, "WOPCM: %uK\n", wopcm->size / 1024);
> }
>
> static inline u32 context_reserved_size(struct drm_i915_private *i915)
> @@ -112,7 +112,7 @@ static inline bool gen9_check_dword_gap(struct drm_i915_private *i915,
> offset = guc_wopcm_base + GEN9_GUC_WOPCM_OFFSET;
> if (offset > guc_wopcm_size ||
> (guc_wopcm_size - offset) < sizeof(u32)) {
> - dev_err(i915->drm.dev,
> + drm_err(&i915->drm,
> "WOPCM: invalid GuC region size: %uK < %uK\n",
> guc_wopcm_size / SZ_1K,
> (u32)(offset + sizeof(u32)) / SZ_1K);
> @@ -131,7 +131,7 @@ static inline bool gen9_check_huc_fw_fits(struct drm_i915_private *i915,
> * firmware uploading would fail.
> */
> if (huc_fw_size > guc_wopcm_size - GUC_WOPCM_RESERVED) {
> - dev_err(i915->drm.dev, "WOPCM: no space for %s: %uK < %uK\n",
> + drm_err(&i915->drm, "WOPCM: no space for %s: %uK < %uK\n",
> intel_uc_fw_type_repr(INTEL_UC_FW_TYPE_HUC),
> (guc_wopcm_size - GUC_WOPCM_RESERVED) / SZ_1K,
> huc_fw_size / 1024);
> @@ -166,7 +166,7 @@ static inline bool __check_layout(struct drm_i915_private *i915, u32 wopcm_size,
>
> size = wopcm_size - ctx_rsvd;
> if (unlikely(range_overflows(guc_wopcm_base, guc_wopcm_size, size))) {
> - dev_err(i915->drm.dev,
> + drm_err(&i915->drm,
> "WOPCM: invalid GuC region layout: %uK + %uK > %uK\n",
> guc_wopcm_base / SZ_1K, guc_wopcm_size / SZ_1K,
> size / SZ_1K);
> @@ -175,7 +175,7 @@ static inline bool __check_layout(struct drm_i915_private *i915, u32 wopcm_size,
>
> size = guc_fw_size + GUC_WOPCM_RESERVED + GUC_WOPCM_STACK_RESERVED;
> if (unlikely(guc_wopcm_size < size)) {
> - dev_err(i915->drm.dev, "WOPCM: no space for %s: %uK < %uK\n",
> + drm_err(&i915->drm, "WOPCM: no space for %s: %uK < %uK\n",
> intel_uc_fw_type_repr(INTEL_UC_FW_TYPE_GUC),
> guc_wopcm_size / SZ_1K, size / SZ_1K);
> return false;
> @@ -183,7 +183,7 @@ static inline bool __check_layout(struct drm_i915_private *i915, u32 wopcm_size,
>
> size = huc_fw_size + WOPCM_RESERVED_SIZE;
> if (unlikely(guc_wopcm_base < size)) {
> - dev_err(i915->drm.dev, "WOPCM: no space for %s: %uK < %uK\n",
> + drm_err(&i915->drm, "WOPCM: no space for %s: %uK < %uK\n",
> intel_uc_fw_type_repr(INTEL_UC_FW_TYPE_HUC),
> guc_wopcm_base / SZ_1K, size / SZ_1K);
> return false;
> @@ -242,10 +242,8 @@ void intel_wopcm_init(struct intel_wopcm *wopcm)
> return;
>
> if (__wopcm_regs_locked(gt->uncore, &guc_wopcm_base, &guc_wopcm_size)) {
> - DRM_DEV_DEBUG_DRIVER(i915->drm.dev,
> - "GuC WOPCM is already locked [%uK, %uK)\n",
> - guc_wopcm_base / SZ_1K,
> - guc_wopcm_size / SZ_1K);
> + drm_dbg(&i915->drm, "GuC WOPCM is already locked [%uK, %uK)\n",
> + guc_wopcm_base / SZ_1K, guc_wopcm_size / SZ_1K);
> goto check;
> }
>
> @@ -266,8 +264,8 @@ void intel_wopcm_init(struct intel_wopcm *wopcm)
> guc_wopcm_size = wopcm->size - ctx_rsvd - guc_wopcm_base;
> guc_wopcm_size &= GUC_WOPCM_SIZE_MASK;
>
> - DRM_DEV_DEBUG_DRIVER(i915->drm.dev, "Calculated GuC WOPCM [%uK, %uK)\n",
> - guc_wopcm_base / SZ_1K, guc_wopcm_size / SZ_1K);
> + drm_dbg(&i915->drm, "Calculated GuC WOPCM [%uK, %uK)\n",
> + guc_wopcm_base / SZ_1K, guc_wopcm_size / SZ_1K);
>
> check:
> if (__check_layout(i915, wopcm->size, guc_wopcm_base, guc_wopcm_size,
> --
> 2.20.1
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-03-25 9:10 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-20 14:36 [Intel-gfx] [PATCH 00/13] drm/i915: drm device based logging changes Jani Nikula
2020-03-20 14:36 ` [Intel-gfx] [PATCH 01/13] drm/i915/ddi: use struct drm_device based logging Jani Nikula
2020-03-25 8:36 ` Daniel Vetter
2020-03-20 14:36 ` [Intel-gfx] [PATCH 02/13] drm/i915/display_power: " Jani Nikula
2020-03-25 8:38 ` Daniel Vetter
2020-03-20 14:36 ` [Intel-gfx] [PATCH 03/13] drm/i915/dp_aux_backlight: " Jani Nikula
2020-03-25 8:39 ` Daniel Vetter
2020-03-20 14:36 ` [Intel-gfx] [PATCH 04/13] drm/i915/dp_mst: " Jani Nikula
2020-03-25 8:40 ` Daniel Vetter
2020-03-20 14:36 ` [Intel-gfx] [PATCH 05/13] drm/i915/dsi: " Jani Nikula
2020-03-25 8:45 ` Daniel Vetter
2020-03-20 14:36 ` [Intel-gfx] [PATCH 06/13] drm/i915/hdmi: " Jani Nikula
2020-03-25 8:43 ` Daniel Vetter
2020-03-25 17:55 ` Jani Nikula
2020-03-20 14:36 ` [Intel-gfx] [PATCH 07/13] drm/i915/dsi: " Jani Nikula
2020-03-25 8:51 ` Daniel Vetter
2020-03-25 17:53 ` Jani Nikula
2020-03-20 14:36 ` [Intel-gfx] [PATCH 08/13] drm/i915/connector: use MISSING_CASE instead of logging Jani Nikula
2020-03-25 8:52 ` Daniel Vetter
2020-03-20 14:36 ` [Intel-gfx] [PATCH 09/13] drm/i915/tv: use struct drm_device based logging Jani Nikula
2020-03-25 8:53 ` Daniel Vetter
2020-03-20 14:36 ` [Intel-gfx] [PATCH 10/13] drm/i915/display: clean up intel_PLL_is_valid() Jani Nikula
2020-03-25 8:56 ` Daniel Vetter
2020-03-25 17:57 ` Jani Nikula
2020-03-20 14:36 ` [Intel-gfx] [PATCH 11/13] drm/i915/display: use struct drm_device based logging Jani Nikula
2020-03-25 8:57 ` Daniel Vetter
2020-03-20 14:36 ` [Intel-gfx] [PATCH 12/13] drm/i915/psr: " Jani Nikula
2020-03-25 9:03 ` Daniel Vetter
2020-03-20 14:36 ` [Intel-gfx] [PATCH 13/13] drm/i915/wopcm: convert to drm device " Jani Nikula
2020-03-25 9:10 ` Daniel Vetter [this message]
2020-03-20 19:05 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: drm device based logging changes Patchwork
2020-03-20 19:29 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-03-21 1:36 ` [Intel-gfx] ✓ Fi.CI.IGT: " 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=20200325091022.GY2363188@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/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: link
Be 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.