Commit 1538f65f authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/fb: move intel_fb_uses_dpt to intel_fb.c and un-inline 



Move fb functions where they belong, and un-inline to avoid looking into
struct drm_i915_private guts in header files.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/4aa89f113ce6d840d62f50c989e2a1415483557c.1638366969.git.jani.nikula@intel.com
parent 92e9624a

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

+0 −10
Original line number Diff line number Diff line
@@ -1990,16 +1990,6 @@ intel_crtc_needs_modeset(const struct intel_crtc_state *crtc_state) 
	return drm_atomic_crtc_needs_modeset(&crtc_state->uapi);

}



static inline bool intel_modifier_uses_dpt(struct drm_i915_private *i915, u64 modifier)

{

	return DISPLAY_VER(i915) >= 13 && modifier != DRM_FORMAT_MOD_LINEAR;

}



static inline bool intel_fb_uses_dpt(const struct drm_framebuffer *fb)

{

	return fb && intel_modifier_uses_dpt(to_i915(fb->dev), fb->modifier);

}



static inline u32 intel_plane_ggtt_offset(const struct intel_plane_state *plane_state)

{

	return i915_ggtt_offset(plane_state->ggtt_vma);

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

+10 −0
Original line number Diff line number Diff line
@@ -658,6 +658,16 @@ static unsigned int intel_fb_modifier_to_tiling(u64 fb_modifier) 
	}

}



static bool intel_modifier_uses_dpt(struct drm_i915_private *i915, u64 modifier)

{

	return DISPLAY_VER(i915) >= 13 && modifier != DRM_FORMAT_MOD_LINEAR;

}



bool intel_fb_uses_dpt(const struct drm_framebuffer *fb)

{

	return fb && intel_modifier_uses_dpt(to_i915(fb->dev), fb->modifier);

}



unsigned int intel_cursor_alignment(const struct drm_i915_private *i915)

{

	if (IS_I830(i915))

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

+2 −0
Original line number Diff line number Diff line
@@ -90,4 +90,6 @@ intel_user_framebuffer_create(struct drm_device *dev, 
			      struct drm_file *filp,

			      const struct drm_mode_fb_cmd2 *user_mode_cmd);



bool intel_fb_uses_dpt(const struct drm_framebuffer *fb);



#endif /* __INTEL_FB_H__ */