mirror of
https://github.com/torvalds/linux.git
synced 2026-05-24 07:03:03 +02:00
drm/i915/display: duplicate 128-byte Y-tiling feature check
We should try to get rid of checks that depend on struct drm_i915_private (or struct xe_device) in display code. HAS_128_BYTE_Y_TILING() is one of them. In the interest of simplicity, just duplicate the check as HAS_128B_Y_TILING() in display. v2: gen2 also has 128-byte Y-tile Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://lore.kernel.org/r/2a7877f8f1d11114c1a17869bd24d83e13b1fac2.1760094361.git.jani.nikula@intel.com
This commit is contained in:
parent
dd1409b62e
commit
129c0aa5eb
|
|
@ -142,6 +142,7 @@ struct intel_display_platforms {
|
|||
func(overlay_needs_physical); \
|
||||
func(supports_tv);
|
||||
|
||||
#define HAS_128B_Y_TILING(__display) (!(__display)->platform.i915g && !(__display)->platform.i915gm)
|
||||
#define HAS_4TILE(__display) ((__display)->platform.dg2 || DISPLAY_VER(__display) >= 14)
|
||||
#define HAS_ASYNC_FLIPS(__display) (DISPLAY_VER(__display) >= 5)
|
||||
#define HAS_AS_SDP(__display) (DISPLAY_VER(__display) >= 13)
|
||||
|
|
|
|||
|
|
@ -777,7 +777,6 @@ unsigned int
|
|||
intel_tile_width_bytes(const struct drm_framebuffer *fb, int color_plane)
|
||||
{
|
||||
struct intel_display *display = to_intel_display(fb->dev);
|
||||
struct drm_i915_private *i915 = to_i915(display->drm);
|
||||
unsigned int cpp = fb->format->cpp[color_plane];
|
||||
|
||||
switch (fb->modifier) {
|
||||
|
|
@ -814,7 +813,7 @@ intel_tile_width_bytes(const struct drm_framebuffer *fb, int color_plane)
|
|||
return 64;
|
||||
fallthrough;
|
||||
case I915_FORMAT_MOD_Y_TILED:
|
||||
if (HAS_128_BYTE_Y_TILING(i915))
|
||||
if (HAS_128B_Y_TILING(display))
|
||||
return 128;
|
||||
else
|
||||
return 512;
|
||||
|
|
|
|||
|
|
@ -36,6 +36,5 @@ static inline struct drm_i915_private *to_i915(const struct drm_device *dev)
|
|||
#define IS_MOBILE(xe) (xe && 0)
|
||||
|
||||
#define HAS_FLAT_CCS(xe) (xe_device_has_flat_ccs(xe))
|
||||
#define HAS_128_BYTE_Y_TILING(xe) (xe || 1)
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user