From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com, Dave Airlie <airlied@redhat.com>
Subject: [Intel-gfx] [PATCH v11 05/10] drm/i915: split fb scalable checks into g4x and skl versions
Date: Thu, 4 Feb 2021 21:43:22 +0200 [thread overview]
Message-ID: <6a350d348f1cb7dadce46ee1e0f6c5c45753c571.1612467466.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1612467466.git.jani.nikula@intel.com>
From: Dave Airlie <airlied@redhat.com>
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>
---
drivers/gpu/drm/i915/display/intel_sprite.c | 7 +++----
drivers/gpu/drm/i915/display/skl_universal_plane.c | 4 ++--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index b8288330dbc9..46fcb5b9983f 100644
--- 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 29c2e3693e8b..4ae1a2ef29ec 100644
--- 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);
}
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-02-04 19:44 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-04 19:43 [Intel-gfx] [PATCH v11 00/10] drm/i915: refactor intel_display.c + a bit more Jani Nikula
2021-02-04 19:43 ` [Intel-gfx] [PATCH v11 01/10] drm/i915: refactor ddi translations into a separate file (v2) Jani Nikula
2021-02-05 13:48 ` Jani Nikula
2021-02-04 19:43 ` [Intel-gfx] [PATCH v11 02/10] drm/i915: migrate hsw fdi code to new file Jani Nikula
2021-02-05 13:52 ` Jani Nikula
2021-02-04 19:43 ` [Intel-gfx] [PATCH v11 03/10] drm/i915: migrate skl planes code new file (v5) Jani Nikula
2021-02-04 20:28 ` Ville Syrjälä
2021-02-04 20:35 ` Jani Nikula
2021-02-04 19:43 ` [Intel-gfx] [PATCH v11 04/10] drm/i915: move pipe update code into crtc. (v2) Jani Nikula
2021-02-04 19:43 ` Jani Nikula [this message]
2021-02-04 19:43 ` [Intel-gfx] [PATCH v11 06/10] drm/i915: move is_ccs_modifier to an inline Jani Nikula
2021-02-04 19:43 ` [Intel-gfx] [PATCH v11 07/10] drm/i915: migrate pll enable/disable code to intel_dpll.[ch] Jani Nikula
2021-02-04 19:43 ` [Intel-gfx] [PATCH v11 08/10] drm/i915: migrate i9xx plane get config Jani Nikula
2021-02-04 19:43 ` [Intel-gfx] [PATCH v11 09/10] drm/i915: refactor skylake scaler code into new file Jani Nikula
2021-02-04 20:35 ` Ville Syrjälä
2021-02-04 19:43 ` [Intel-gfx] [PATCH v11 10/10] drm/i915: move ddi pll state get to dpll mgr Jani Nikula
2021-02-04 22:45 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: refactor intel_display.c + a bit more Patchwork
2021-02-04 22:47 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-02-04 23:14 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-02-05 6:46 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " 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=6a350d348f1cb7dadce46ee1e0f6c5c45753c571.1612467466.git.jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=airlied@redhat.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.