All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dave Airlie <airlied@gmail.com>
To: intel-gfx@lists.freedesktop.org
Cc: Dave Airlie <airlied@redhat.com>
Subject: [Intel-gfx] [PATCH 06/10] drm/i915: move is_ccs_modifier to an inline
Date: Fri, 22 Jan 2021 07:59:19 +1000	[thread overview]
Message-ID: <20210121215924.18964-7-airlied@gmail.com> (raw)
In-Reply-To: <20210121215924.18964-1-airlied@gmail.com>

From: Dave Airlie <airlied@redhat.com>

There is no need for this to be out of line.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 drivers/gpu/drm/i915/display/intel_display.c       | 8 --------
 drivers/gpu/drm/i915/display/intel_display.h       | 1 -
 drivers/gpu/drm/i915/display/intel_display_types.h | 8 ++++++++
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 6d2978179ac0..56ca70228886 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -1791,14 +1791,6 @@ intel_get_format_info(const struct drm_mode_fb_cmd2 *cmd)
 	}
 }
 
-bool is_ccs_modifier(u64 modifier)
-{
-	return modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
-	       modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
-	       modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
-	       modifier == I915_FORMAT_MOD_Yf_TILED_CCS;
-}
-
 static int gen12_ccs_aux_stride(struct drm_framebuffer *fb, int ccs_plane)
 {
 	return DIV_ROUND_UP(fb->pitches[skl_ccs_to_main_plane(fb, ccs_plane)],
diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index 0b2fed58badf..f4214e161a9d 100644
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -508,7 +508,6 @@ void intel_link_compute_m_n(u16 bpp, int nlanes,
 			    int pixel_clock, int link_clock,
 			    struct intel_link_m_n *m_n,
 			    bool constant_n, bool fec_enable);
-bool is_ccs_modifier(u64 modifier);
 void lpt_disable_clkout_dp(struct drm_i915_private *dev_priv);
 u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv,
 			      u32 pixel_format, u64 modifier);
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 58cec59fd4f7..ed06e7e6a634 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1876,6 +1876,14 @@ static inline u32 intel_fdi_link_freq(struct drm_i915_private *dev_priv,
 		return dev_priv->fdi_pll_freq;
 }
 
+static inline bool is_ccs_modifier(u64 modifier)
+{
+	return modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
+	       modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
+	       modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
+	       modifier == I915_FORMAT_MOD_Yf_TILED_CCS;
+}
+
 static inline bool is_ccs_plane(const struct drm_framebuffer *fb, int plane)
 {
 	if (!is_ccs_modifier(fb->modifier))
-- 
2.27.0

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

  parent reply	other threads:[~2021-01-21 21:59 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-21 21:59 [Intel-gfx] [rfc v9] refactor intel_display.c + a bit more Dave Airlie
2021-01-21 21:59 ` [Intel-gfx] [PATCH 01/10] drm/i915: refactor ddi translations into a separate file (v2) Dave Airlie
2021-01-21 21:59 ` [Intel-gfx] [PATCH 02/10] drm/i915: migrate hsw fdi code to new file Dave Airlie
2021-01-21 21:59 ` [Intel-gfx] [PATCH 03/10] drm/i915: migrate skl planes code new file (v4) Dave Airlie
2021-01-21 21:59 ` [Intel-gfx] [PATCH 04/10] drm/i915: move pipe update code into crtc Dave Airlie
2021-01-21 21:59 ` [Intel-gfx] [PATCH 05/10] drm/i915: split fb scalable checks into g4x and skl versions Dave Airlie
2021-01-21 21:59 ` Dave Airlie [this message]
2021-01-21 21:59 ` [Intel-gfx] [PATCH 07/10] drm/i915: migrate pll enable/disable code to intel_dpll.[ch] Dave Airlie
2021-01-21 21:59 ` [Intel-gfx] [PATCH 08/10] drm/i915: migrate i9xx plane get config Dave Airlie
2021-01-21 21:59 ` [Intel-gfx] [PATCH 09/10] drm/i915: refactor skylake scaler code into new file Dave Airlie
2021-01-21 21:59 ` [Intel-gfx] [PATCH 10/10] drm/i915: move ddi pll state get to dpll mgr Dave Airlie
2021-01-22  3:49 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [01/10] drm/i915: refactor ddi translations into a separate file (v2) Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2021-01-27  3:05 [Intel-gfx] [rfc v10] refactor intel_display.c + a bit more Dave Airlie
2021-01-27  3:05 ` [Intel-gfx] [PATCH 06/10] drm/i915: move is_ccs_modifier to an inline Dave Airlie

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=20210121215924.18964-7-airlied@gmail.com \
    --to=airlied@gmail.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.