[Intel-gfx] [PATCH] drm/i915: Prioritize SSC quirk table when determining SSC settings
Michel Alexandre Salim
salimma at fedoraproject.org
Wed Nov 9 15:11:40 CET 2011
>From ab11cf4b1b28d0abb1db8bc992d016b257489ab5 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma at fedoraproject.org>
Date: Wed, 9 Nov 2011 14:18:45 +0100
Subject: [PATCH] drm/i915: Prioritize SSC quirk table when determining SSC
settings
Commit 72bbe58cd9568c7766cc219a779ea68a02132797 makes the check against
the quirk table unreachable if i915_panel_use_ssc is set. This patch
reorders the tests so that the quirk table is checked first, the
i915_panel_use_ssc next and the original per-device setting last.
Signed-off-by: Michel Alexandre Salim <salimma at fedoraproject.org>
---
drivers/gpu/drm/i915/intel_display.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 981b1f1..23a05bb 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4660,10 +4660,11 @@ static void intel_update_watermarks(struct drm_device *dev)
static inline bool intel_panel_use_ssc(struct drm_i915_private *dev_priv)
{
+ if (dev_priv->quirks & QUIRK_LVDS_SSC_DISABLE)
+ return false;
if (i915_panel_use_ssc >= 0)
return i915_panel_use_ssc != 0;
- return dev_priv->lvds_use_ssc
- && !(dev_priv->quirks & QUIRK_LVDS_SSC_DISABLE);
+ return dev_priv->lvds_use_ssc;
}
/**
--
1.7.6.4
More information about the Intel-gfx
mailing list