| From b991b00d3a25db3f081d1b8a3216fcf1abf7c519 Mon Sep 17 00:00:00 2001 |
| From: Jani Nikula <jani.nikula@intel.com> |
| Date: Tue, 24 Sep 2013 16:44:39 +0300 |
| Subject: drm/i915: backlight combination mode bit is gen4 only |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| Not valid for later non-PCH split platforms such as VLV. |
| |
| Signed-off-by: Jani Nikula <jani.nikula@intel.com> |
| Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit d9c638d5c6fb96770e77637547629a32cb362075) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_panel.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c |
| index 3bc89a6bc3ee..8f025c694733 100644 |
| --- a/drivers/gpu/drm/i915/intel_panel.c |
| +++ b/drivers/gpu/drm/i915/intel_panel.c |
| @@ -329,7 +329,7 @@ static int is_backlight_combination_mode(struct drm_device *dev) |
| { |
| struct drm_i915_private *dev_priv = dev->dev_private; |
| |
| - if (INTEL_INFO(dev)->gen >= 4) |
| + if (IS_GEN4(dev)) |
| return I915_READ(BLC_PWM_CTL2) & BLM_COMBINATION_MODE; |
| |
| if (IS_GEN2(dev)) |
| -- |
| 1.8.5.rc3 |
| |