aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_sprite.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sprite.c')
-rw-r--r--drivers/gpu/drm/i915/intel_sprite.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index d2e003d8f3db..f70d2c607902 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -1087,7 +1087,7 @@ static u32 g4x_sprite_ctl(const struct intel_crtc_state *crtc_state,
1087 1087
1088 dvscntr = DVS_ENABLE | DVS_GAMMA_ENABLE; 1088 dvscntr = DVS_ENABLE | DVS_GAMMA_ENABLE;
1089 1089
1090 if (IS_GEN6(dev_priv)) 1090 if (IS_GEN(dev_priv, 6))
1091 dvscntr |= DVS_TRICKLE_FEED_DISABLE; 1091 dvscntr |= DVS_TRICKLE_FEED_DISABLE;
1092 1092
1093 switch (fb->format->format) { 1093 switch (fb->format->format) {
@@ -1983,7 +1983,7 @@ static bool skl_plane_has_planar(struct drm_i915_private *dev_priv,
1983 if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv)) 1983 if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
1984 return false; 1984 return false;
1985 1985
1986 if (IS_GEN9(dev_priv) && !IS_GEMINILAKE(dev_priv) && pipe == PIPE_C) 1986 if (IS_GEN(dev_priv, 9) && !IS_GEMINILAKE(dev_priv) && pipe == PIPE_C)
1987 return false; 1987 return false;
1988 1988
1989 if (plane_id != PLANE_PRIMARY && plane_id != PLANE_SPRITE0) 1989 if (plane_id != PLANE_PRIMARY && plane_id != PLANE_SPRITE0)
@@ -2163,7 +2163,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
2163 plane->check_plane = g4x_sprite_check; 2163 plane->check_plane = g4x_sprite_check;
2164 2164
2165 modifiers = i9xx_plane_format_modifiers; 2165 modifiers = i9xx_plane_format_modifiers;
2166 if (IS_GEN6(dev_priv)) { 2166 if (IS_GEN(dev_priv, 6)) {
2167 formats = snb_plane_formats; 2167 formats = snb_plane_formats;
2168 num_formats = ARRAY_SIZE(snb_plane_formats); 2168 num_formats = ARRAY_SIZE(snb_plane_formats);
2169 2169