drm/i915: split fb scalable checks into g4x and skl versions

This just cleans these up a bit.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/c91d924e93965515d2017dbf3c89c245ff6d52ea.1612536383.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index b828833..46fcb5b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -1365,19 +1365,18 @@ g4x_plane_get_hw_state(struct intel_plane *plane,
        return ret;
 }
 
-static bool intel_fb_scalable(const struct drm_framebuffer *fb)
+static bool g4x_fb_scalable(const struct drm_framebuffer *fb)
 {
        if (!fb)
                return false;
 
        switch (fb->format->format) {
        case DRM_FORMAT_C8:
-               return false;
        case DRM_FORMAT_XRGB16161616F:
        case DRM_FORMAT_ARGB16161616F:
        case DRM_FORMAT_XBGR16161616F:
        case DRM_FORMAT_ABGR16161616F:
-               return INTEL_GEN(to_i915(fb->dev)) >= 11;
+               return false;
        default:
                return true;
        }
@@ -1454,7 +1453,7 @@ g4x_sprite_check(struct intel_crtc_state *crtc_state,
        int max_scale = DRM_PLANE_HELPER_NO_SCALING;
        int ret;
 
-       if (intel_fb_scalable(plane_state->hw.fb)) {
+       if (g4x_fb_scalable(plane_state->hw.fb)) {
                if (INTEL_GEN(dev_priv) < 7) {
                        min_scale = 1;
                        max_scale = 16 << 16;

diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 29c2e36..4ae1a2e 100644 (file)
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -1618,7 +1618,7 @@ static int skl_check_plane_surface(struct intel_plane_state *plane_state)
        return 0;
 }
 
-static bool intel_fb_scalable(const struct drm_framebuffer *fb)
+static bool skl_fb_scalable(const struct drm_framebuffer *fb)
 {
        if (!fb)
                return false;
@@ -1651,7 +1651,7 @@ static int skl_plane_check(struct intel_crtc_state *crtc_state,
                return ret;
 
        /* use scaler when colorkey is not required */
-       if (!plane_state->ckey.flags && intel_fb_scalable(fb)) {
+       if (!plane_state->ckey.flags && skl_fb_scalable(fb)) {
                min_scale = 1;
                max_scale = skl_plane_max_scale(dev_priv, fb);
        }