summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorVille Syrjälä2017-02-08 18:53:28 +0100
committerVille Syrjälä2017-02-10 17:44:53 +0100
commit6401c37dbd6264b045961868c1438bf03efdd104 (patch)
tree91075645fc861d99a2a0b8a0aed0f148dd4105e5 /drivers/gpu/drm/i915/intel_display.c
parentdrm/i915: Avoid spurious WARNs about the wrong pipe in the PPS code (diff)
downloadkernel-qcow2-linux-6401c37dbd6264b045961868c1438bf03efdd104.tar.gz
kernel-qcow2-linux-6401c37dbd6264b045961868c1438bf03efdd104.tar.xz
kernel-qcow2-linux-6401c37dbd6264b045961868c1438bf03efdd104.zip
drm/i915: Simplify platform checks in intel_fb_pitch_limit()
Replace the VLV/CHV check with a HAS_GMCH_DISPLAY check in intel_fb_pitch_limit(), because it's shorter. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170208175328.11064-1-ville.syrjala@linux.intel.com Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index ab78df9191f9..88b7d96c46a4 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14346,8 +14346,7 @@ u32 intel_fb_pitch_limit(struct drm_i915_private *dev_priv,
* pixels and 32K bytes."
*/
return min(8192 * cpp, 32768);
- } else if (gen >= 5 && !IS_VALLEYVIEW(dev_priv) &&
- !IS_CHERRYVIEW(dev_priv)) {
+ } else if (gen >= 5 && !HAS_GMCH_DISPLAY(dev_priv)) {
return 32*1024;
} else if (gen >= 4) {
if (fb_modifier == I915_FORMAT_MOD_X_TILED)