Commit 14cebc1f authored by Dave Airlie's avatar Dave Airlie Committed by Jani Nikula
Browse files

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



This just cleans these up a bit.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/c91d924e93965515d2017dbf3c89c245ff6d52ea.1612536383.git.jani.nikula@intel.com
parent d471008b

drivers/gpu/drm/i915/display/intel_sprite.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/i915/display/skl_universal_plane.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	}