All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dave Airlie <airlied@gmail.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 11/11] drm/i915: split fb scalable checks into g4x and skl versions
Date: Fri, 11 Dec 2020 17:29:22 +1000	[thread overview]
Message-ID: <20201211072922.19101-12-airlied@gmail.com> (raw)
In-Reply-To: <20201211072922.19101-1-airlied@gmail.com>

From: Dave Airlie <airlied@redhat.com>

This just cleans these up a bit.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 drivers/gpu/drm/i915/display/intel_gen9_plane.c | 4 ++--
 drivers/gpu/drm/i915/display/intel_sprite.c     | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_gen9_plane.c b/drivers/gpu/drm/i915/display/intel_gen9_plane.c
index d547edabb5ce..487bc0166e31 100644
--- a/drivers/gpu/drm/i915/display/intel_gen9_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_gen9_plane.c
@@ -2139,7 +2139,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;
@@ -2172,7 +2172,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);
 	}
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index cc3bec42d04c..4cb6339d12be 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -1282,19 +1282,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;
 	}
@@ -1371,7 +1370,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;
-- 
2.27.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2020-12-11  7:29 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-11  7:29 [Intel-gfx] [RFC v3] refactor intel display a bit more Dave Airlie
2020-12-11  7:29 ` [Intel-gfx] [PATCH 01/11] drm/i915/display: move needs_modeset to an inline in header Dave Airlie
2020-12-11  7:29 ` [Intel-gfx] [PATCH 02/11] drm/i915/display: move to_intel_frontbuffer to header Dave Airlie
2020-12-11  7:29 ` [Intel-gfx] [PATCH 03/11] drm/i915/display: fix misused comma Dave Airlie
2020-12-11  7:29 ` [Intel-gfx] [PATCH 04/11] drm/i915: refactor cursor code out of i915_display.c Dave Airlie
2020-12-16 10:05   ` Jani Nikula
2020-12-11  7:29 ` [Intel-gfx] [PATCH 05/11] drm/i915: refactor some crtc code out of intel display Dave Airlie
2020-12-16 10:03   ` Jani Nikula
2020-12-16 11:44     ` Ville Syrjälä
2020-12-16 12:18       ` Jani Nikula
2020-12-11  7:29 ` [Intel-gfx] [PATCH 06/11] drm/i915: refactor pll code out into intel_dpll.c Dave Airlie
2020-12-16 10:31   ` Jani Nikula
2020-12-11  7:29 ` [Intel-gfx] [PATCH 07/11] drm/i915: split fdi code out from intel_display.c Dave Airlie
2020-12-16 10:38   ` Jani Nikula
2020-12-11  7:29 ` [Intel-gfx] [PATCH 08/11] drm/i915: migrate hsw fdi code to new file Dave Airlie
2020-12-16 11:07   ` Jani Nikula
2020-12-11  7:29 ` [Intel-gfx] [PATCH 09/11] drm/i915: migrate skl planes code " Dave Airlie
2020-12-11 16:53   ` kernel test robot
2020-12-11 16:53     ` kernel test robot
2020-12-11 22:00   ` kernel test robot
2020-12-11 22:00     ` kernel test robot
2020-12-11 22:19   ` kernel test robot
2020-12-11 22:19     ` kernel test robot
2020-12-11 22:19   ` [Intel-gfx] [RFC PATCH] drm/i915: skl_plane_ctl_crtc() can be static kernel test robot
2020-12-11 22:19     ` kernel test robot
2020-12-11  7:29 ` [Intel-gfx] [PATCH 10/11] drm/i915: move pipe update code into crtc Dave Airlie
2020-12-11  7:29 ` Dave Airlie [this message]
2020-12-11  7:58 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [01/11] drm/i915/display: move needs_modeset to an inline in header Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201211072922.19101-12-airlied@gmail.com \
    --to=airlied@gmail.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.