From: Lucas De Marchi Date: Wed, 28 Jul 2021 21:59:26 +0000 (-0700) Subject: drm/i915/display: remove explicit CNL handling from intel_crtc.c X-Git-Tag: v5.15~419^2~9^2~25 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=89a346007c450c66ce96d90b2af25eb37140b1b2;p=mirror_ubuntu-kernels.git drm/i915/display: remove explicit CNL handling from intel_crtc.c No need for special CNL handling as there is no real platform with that configuration. Signed-off-by: Lucas De Marchi Reviewed-by: Matt Roper Link: https://patchwork.freedesktop.org/patch/msgid/20210728215946.1573015-6-lucas.demarchi@intel.com --- diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c index 448c4d99ac35..254e67141a77 100644 --- a/drivers/gpu/drm/i915/display/intel_crtc.c +++ b/drivers/gpu/drm/i915/display/intel_crtc.c @@ -335,7 +335,7 @@ int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) dev_priv->plane_to_crtc_mapping[i9xx_plane] = crtc; } - if (DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)) + if (DISPLAY_VER(dev_priv) >= 11) drm_crtc_create_scaling_filter_property(&crtc->base, BIT(DRM_SCALING_FILTER_DEFAULT) | BIT(DRM_SCALING_FILTER_NEAREST_NEIGHBOR));