From: "Jouni Högander" <jouni.hogander@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: "Jouni Högander" <jouni.hogander@intel.com>
Subject: [Intel-xe] [PATCH v5 4/9] drm/i915/display: Convert intel_fb_modifier_to_tiling as non-static
Date: Thu, 7 Dec 2023 07:22:47 +0200 [thread overview]
Message-ID: <20231207052252.2092191-5-jouni.hogander@intel.com> (raw)
In-Reply-To: <20231207052252.2092191-1-jouni.hogander@intel.com>
We are about to split i915 specific code from intel_fb.c. Convert
intel_fb_modifier_to_tiling as non-static to allow calling it from split
code.
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231203114840.841311-3-jouni.hogander@intel.com
(cherry picked from commit 6383f69bd2ccd4765b22d60f12576891daa36c1a)
---
drivers/gpu/drm/i915/display/intel_fb.c | 40 ++++++++++++-------------
drivers/gpu/drm/i915/display/intel_fb.h | 2 ++
2 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index b17600aba577..f42a693f96c1 100644
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -301,6 +301,26 @@ lookup_format_info(const struct drm_format_info formats[],
return NULL;
}
+unsigned int intel_fb_modifier_to_tiling(u64 fb_modifier)
+{
+ u8 tiling_caps = lookup_modifier(fb_modifier)->plane_caps &
+ INTEL_PLANE_CAP_TILING_MASK;
+
+ switch (tiling_caps) {
+ case INTEL_PLANE_CAP_TILING_Y:
+ return I915_TILING_Y;
+ case INTEL_PLANE_CAP_TILING_X:
+ return I915_TILING_X;
+ case INTEL_PLANE_CAP_TILING_4:
+ case INTEL_PLANE_CAP_TILING_Yf:
+ case INTEL_PLANE_CAP_TILING_NONE:
+ return I915_TILING_NONE;
+ default:
+ MISSING_CASE(tiling_caps);
+ return I915_TILING_NONE;
+ }
+}
+
/**
* intel_fb_get_format_info: Get a modifier specific format information
* @cmd: FB add command structure
@@ -737,26 +757,6 @@ intel_fb_align_height(const struct drm_framebuffer *fb,
return ALIGN(height, tile_height);
}
-static unsigned int intel_fb_modifier_to_tiling(u64 fb_modifier)
-{
- u8 tiling_caps = lookup_modifier(fb_modifier)->plane_caps &
- INTEL_PLANE_CAP_TILING_MASK;
-
- switch (tiling_caps) {
- case INTEL_PLANE_CAP_TILING_Y:
- return I915_TILING_Y;
- case INTEL_PLANE_CAP_TILING_X:
- return I915_TILING_X;
- case INTEL_PLANE_CAP_TILING_4:
- case INTEL_PLANE_CAP_TILING_Yf:
- case INTEL_PLANE_CAP_TILING_NONE:
- return I915_TILING_NONE;
- default:
- MISSING_CASE(tiling_caps);
- return I915_TILING_NONE;
- }
-}
-
bool intel_fb_modifier_uses_dpt(struct drm_i915_private *i915, u64 modifier)
{
return HAS_DPT(i915) && modifier != DRM_FORMAT_MOD_LINEAR;
diff --git a/drivers/gpu/drm/i915/display/intel_fb.h b/drivers/gpu/drm/i915/display/intel_fb.h
index e85167d6bc34..23db6628f53e 100644
--- a/drivers/gpu/drm/i915/display/intel_fb.h
+++ b/drivers/gpu/drm/i915/display/intel_fb.h
@@ -95,4 +95,6 @@ intel_user_framebuffer_create(struct drm_device *dev,
bool intel_fb_modifier_uses_dpt(struct drm_i915_private *i915, u64 modifier);
bool intel_fb_uses_dpt(const struct drm_framebuffer *fb);
+unsigned int intel_fb_modifier_to_tiling(u64 fb_modifier);
+
#endif /* __INTEL_FB_H__ */
--
2.34.1
next prev parent reply other threads:[~2023-12-07 5:23 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-07 5:22 [Intel-xe] [PATCH v5 0/9] Intel_fb.c refactoring Jouni Högander
2023-12-07 5:22 ` [Intel-xe] [PATCH v5 1/9] Revert "FIXME: drm/i915: xe intel_fb.c framebuffer init and destroy xe changes" Jouni Högander
2023-12-07 5:22 ` [Intel-xe] [PATCH v5 2/9] fixup! FIXME: drm/i915/display: Remaining changes to make xe compile Jouni Högander
2023-12-07 5:22 ` [Intel-xe] [PATCH v5 3/9] drm/i915/display: use intel_bo_to_drm_bo in intel_fb.c Jouni Högander
2023-12-07 5:22 ` Jouni Högander [this message]
2023-12-07 5:22 ` [Intel-xe] [PATCH v5 5/9] drm/i915/display: Handle invalid fb_modifier in intel_fb_modifier_to_tiling Jouni Högander
2023-12-07 5:22 ` [Intel-xe] [PATCH v5 6/9] drm/i915/display: Split i915 specific code away from intel_fb.c Jouni Högander
2023-12-07 5:22 ` [Intel-xe] [PATCH v5 7/9] drm/i915/display: Add intel_fb_bo_framebuffer_fini Jouni Högander
2023-12-07 5:22 ` [Intel-xe] [PATCH v5 8/9] fixup! drm/xe/display: Implement display support Jouni Högander
2023-12-07 5:22 ` [Intel-xe] [PATCH v5 9/9] " Jouni Högander
2023-12-07 5:25 ` [Intel-xe] ✓ CI.Patch_applied: success for Intel_fb.c refactoring (rev7) Patchwork
2023-12-07 5:26 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-12-07 5:27 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-12-07 5:34 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-12-07 5:35 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-12-07 5:36 ` [Intel-xe] ✗ CI.checksparse: warning " Patchwork
2023-12-07 6:11 ` [Intel-xe] ✓ CI.BAT: success " Patchwork
2023-12-07 15:10 ` [PATCH v5 0/9] Intel_fb.c refactoring Maarten Lankhorst
2023-12-08 6:18 ` Hogander, Jouni
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=20231207052252.2092191-5-jouni.hogander@intel.com \
--to=jouni.hogander@intel.com \
--cc=intel-xe@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox