From: Sagar Arun Kamble <sagar.a.kamble@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH v2 1/1] drm/i915/gen9: Check BIOS RC6 setup before enabling RC6
Date: Fri, 30 Oct 2015 17:00:49 +0530 [thread overview]
Message-ID: <1446204649-18987-1-git-send-email-sagar.a.kamble@intel.com> (raw)
In-Reply-To: <1445938734-1584-1-git-send-email-sagar.a.kamble@intel.com>
RC6 setup is shared between BIOS and Driver. BIOS sets up subset of RC6
configuration registers. If those are not setup Driver should not enable RC6.
For implementing this, driver can check RC_CTRL0 and RC_CTRL1 values
to know if BIOS has enabled HW/SW RC6.
This will also enable user to control RC6 using BIOS settings alone.
v2: Had placed logic in gen8 function by mistake. Fixed it. Ensuring RPM is
not enabled in case BIOS disabled RC6.
Change-Id: If89518708e133be6b3c7c6f90869fb66224b7b87
Signed-off-by: Sagar Arun Kamble <sagar.a.kamble@intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 2c7c9fc..1ec52f2 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -30,6 +30,7 @@
#include "intel_drv.h"
#include "../../../platform/x86/intel_ips.h"
#include <linux/module.h>
+#include <linux/pm_runtime.h>
/**
* RC6 is a special power stage which allows the GPU to enter an very
@@ -4763,6 +4764,20 @@ static void gen9_enable_rc6(struct drm_device *dev)
struct intel_engine_cs *ring;
uint32_t rc6_mask = 0;
int unused;
+ bool hw_rc6_enabled, sw_rc6_enabled;
+ struct device *device = &dev->pdev->dev;
+
+ /* Check if BIOS has enabled HW/SW RC6. Only then enable RC6 */
+ hw_rc6_enabled = I915_READ(GEN6_RC_CONTROL) &
+ (GEN6_RC_CTL_RC6_ENABLE | GEN6_RC_CTL_HW_ENABLE);
+ sw_rc6_enabled = !(I915_READ(GEN6_RC_CONTROL) & GEN6_RC_CTL_HW_ENABLE)
+ && (I915_READ(GEN6_RC_STATE) & 0x40000);
+ if (!(hw_rc6_enabled || sw_rc6_enabled)) {
+ i915.enable_rc6 = 0;
+ pm_runtime_forbid(device);
+ DRM_INFO("RC6 disabled by BIOS, disabled runtime PM support\n");
+ }
+
/* 1a: Software RC state - RC0 */
I915_WRITE(GEN6_RC_STATE, 0);
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-10-30 11:28 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-27 9:38 [PATCH 1/1] drm/i915/gen9: Check BIOS RC6 setup before enabling RC6 Sagar Arun Kamble
2015-10-30 11:30 ` Sagar Arun Kamble [this message]
2015-10-30 16:08 ` [PATCH v2 " Daniel Vetter
2015-10-30 16:09 ` Daniel Vetter
2015-11-04 10:04 ` [PATCH v3 1/1] drm/i915/bxt: " Sagar Arun Kamble
2015-11-17 16:45 ` Daniel Vetter
2015-11-17 16:47 ` Daniel Vetter
2015-11-26 20:59 ` Imre Deak
2015-12-11 8:44 ` [PATCH v4 " Sagar Arun Kamble
2015-12-14 16:36 ` Imre Deak
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=1446204649-18987-1-git-send-email-sagar.a.kamble@intel.com \
--to=sagar.a.kamble@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;
as well as URLs for NNTP newsgroup(s).