Commit 6383f69b authored by Jouni Högander's avatar Jouni Högander
Browse files

drm/i915/display: Convert intel_fb_modifier_to_tiling as non-static 



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: default avatarJouni Högander <jouni.hogander@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231203114840.841311-3-jouni.hogander@intel.com
parent 72207699

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

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

drivers/gpu/drm/i915/display/intel_fb.h

+2 −0
Original line number Diff line number Diff line
@@ -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__ */