From: "Kamble, Sagar A" <sagar.a.kamble@intel.com>
To: Imre Deak <imre.deak@intel.com>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 1/2] drm/i915: Fix log type for RC6 debug messages
Date: Fri, 1 Jul 2016 12:07:38 +0530 [thread overview]
Message-ID: <57760FB2.6050801@intel.com> (raw)
In-Reply-To: <1467216835-1086-1-git-send-email-imre.deak@intel.com>
Reviewed-by: Sagar Arun Kamble <sagar.a.kamble@intel.com>
On 6/29/2016 9:43 PM, Imre Deak wrote:
> RC6 isn't really a KMS feature, so use the more proper DRIVER log type
> for RC6 related debug messages.
>
> CC: Sagar Arun Kamble <sagar.a.kamble@intel.com>
> Signed-off-by: Imre Deak <imre.deak@intel.com>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 26 ++++++++++++++------------
> 1 file changed, 14 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index d7f8ba8..5dce264 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -4973,14 +4973,15 @@ static void intel_print_rc6_info(struct drm_i915_private *dev_priv, u32 mode)
> mode = 0;
> }
> if (HAS_RC6p(dev_priv))
> - DRM_DEBUG_KMS("Enabling RC6 states: RC6 %s RC6p %s RC6pp %s\n",
> - onoff(mode & GEN6_RC_CTL_RC6_ENABLE),
> - onoff(mode & GEN6_RC_CTL_RC6p_ENABLE),
> - onoff(mode & GEN6_RC_CTL_RC6pp_ENABLE));
> + DRM_DEBUG_DRIVER("Enabling RC6 states: "
> + "RC6 %s RC6p %s RC6pp %s\n",
> + onoff(mode & GEN6_RC_CTL_RC6_ENABLE),
> + onoff(mode & GEN6_RC_CTL_RC6p_ENABLE),
> + onoff(mode & GEN6_RC_CTL_RC6pp_ENABLE));
>
> else
> - DRM_DEBUG_KMS("Enabling RC6 states: RC6 %s\n",
> - onoff(mode & GEN6_RC_CTL_RC6_ENABLE));
> + DRM_DEBUG_DRIVER("Enabling RC6 states: RC6 %s\n",
> + onoff(mode & GEN6_RC_CTL_RC6_ENABLE));
> }
>
> static bool bxt_check_bios_rc6_setup(struct drm_i915_private *dev_priv)
> @@ -4990,7 +4991,7 @@ static bool bxt_check_bios_rc6_setup(struct drm_i915_private *dev_priv)
> unsigned long rc6_ctx_base;
>
> if (!(I915_READ(RC6_LOCATION) & RC6_CTX_IN_DRAM)) {
> - DRM_DEBUG_KMS("RC6 Base location not set properly.\n");
> + DRM_DEBUG_DRIVER("RC6 Base location not set properly.\n");
> enable_rc6 = false;
> }
>
> @@ -5002,7 +5003,7 @@ static bool bxt_check_bios_rc6_setup(struct drm_i915_private *dev_priv)
> if (!((rc6_ctx_base >= ggtt->stolen_reserved_base) &&
> (rc6_ctx_base + PAGE_SIZE <= ggtt->stolen_reserved_base +
> ggtt->stolen_reserved_size))) {
> - DRM_DEBUG_KMS("RC6 Base address not as expected.\n");
> + DRM_DEBUG_DRIVER("RC6 Base address not as expected.\n");
> enable_rc6 = false;
> }
>
> @@ -5010,7 +5011,7 @@ static bool bxt_check_bios_rc6_setup(struct drm_i915_private *dev_priv)
> ((I915_READ(PWRCTX_MAXCNT_VCSUNIT0) & IDLE_TIME_MASK) > 1) &&
> ((I915_READ(PWRCTX_MAXCNT_BCSUNIT) & IDLE_TIME_MASK) > 1) &&
> ((I915_READ(PWRCTX_MAXCNT_VECSUNIT) & IDLE_TIME_MASK) > 1))) {
> - DRM_DEBUG_KMS("Engine Idle wait time not set properly.\n");
> + DRM_DEBUG_DRIVER("Engine Idle wait time not set properly.\n");
> enable_rc6 = false;
> }
>
> @@ -5018,7 +5019,7 @@ static bool bxt_check_bios_rc6_setup(struct drm_i915_private *dev_priv)
> GEN6_RC_CTL_HW_ENABLE)) &&
> ((I915_READ(GEN6_RC_CONTROL) & GEN6_RC_CTL_HW_ENABLE) ||
> !(I915_READ(GEN6_RC_STATE) & RC6_STATE))) {
> - DRM_DEBUG_KMS("HW/SW RC6 is not enabled by BIOS.\n");
> + DRM_DEBUG_DRIVER("HW/SW RC6 is not enabled by BIOS.\n");
> enable_rc6 = false;
> }
>
> @@ -5050,8 +5051,9 @@ int sanitize_rc6_option(struct drm_i915_private *dev_priv, int enable_rc6)
> mask = INTEL_RC6_ENABLE;
>
> if ((enable_rc6 & mask) != enable_rc6)
> - DRM_DEBUG_KMS("Adjusting RC6 mask to %d (requested %d, valid %d)\n",
> - enable_rc6 & mask, enable_rc6, mask);
> + DRM_DEBUG_DRIVER("Adjusting RC6 mask to %d "
> + "(requested %d, valid %d)\n",
> + enable_rc6 & mask, enable_rc6, mask);
>
> return enable_rc6 & mask;
> }
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2016-07-01 6:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-29 16:13 [PATCH 1/2] drm/i915: Fix log type for RC6 debug messages Imre Deak
2016-06-29 16:13 ` [PATCH 2/2] drm/i915/bxt: Fix sanity check for BIOS RC6 setup Imre Deak
2016-07-01 6:49 ` Kamble, Sagar A
2016-07-01 9:15 ` Imre Deak
2016-07-01 10:56 ` Kamble, Sagar A
2016-06-29 17:06 ` ✓ Ro.CI.BAT: success for series starting with [1/2] drm/i915: Fix log type for RC6 debug messages Patchwork
2016-07-01 12:03 ` Imre Deak
2016-07-01 6:37 ` Kamble, Sagar A [this message]
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=57760FB2.6050801@intel.com \
--to=sagar.a.kamble@intel.com \
--cc=imre.deak@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox