summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRodrigo Vivi <rodrigo.vivi@intel.com>2014-09-17 16:59:20 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-09-19 14:43:24 +0200
commit342e36c6b0cab1d7461287d553154ff35fee989d (patch)
treebf0f9264b4dea4c5ec710285c133b23bb7f10ff8 /drivers
parent01d06e9f963ba6a83154ab81929b7f5e04bbe5dd (diff)
downloadlinux-stable-342e36c6b0cab1d7461287d553154ff35fee989d.tar.gz
linux-stable-342e36c6b0cab1d7461287d553154ff35fee989d.tar.bz2
linux-stable-342e36c6b0cab1d7461287d553154ff35fee989d.zip
drm/i915: Avoid reading fbc registers in vain when fbc was never enabled.
If it wasn't never enabled by kernel parameter or platform default we can avoid reading registers so many times in vain Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 6f3b94b7300b..1ec3c8f689bc 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -339,6 +339,12 @@ bool intel_fbc_enabled(struct drm_device *dev)
{
struct drm_i915_private *dev_priv = dev->dev_private;
+ /* If it wasn't never enabled by kernel parameter or platform default
+ * we can avoid reading registers so many times in vain
+ */
+ if (!i915.enable_fbc)
+ return false;
+
if (!dev_priv->display.fbc_enabled)
return false;