On Wed, Jun 12, 2024 at 11:47:03PM +0300, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > intel_surf_alignment() in particular has devolved into > a complete mess. Redesign the code so that we can handle > alignment restrictions in a nicer. Also adjust alignment > for TGL+ to actually match the hardware requirements. > > v2: Drop the per-plane vma stuff as it was borked > Don't temporarily remove the 2MiB DPT alignment for UV on TGL > > Ville Syrjälä (9): > drm: Rename drm_plane_check_pixel_format() to drm_plane_has_format() > drm: Export drm_plane_has_format() Maarten/Maxime/Thomas, can I get an ack for merging these via drm-intel please? > drm/i915: Introduce the plane->min_alignment() vfunc > drm/i915: Introduce fb->min_alignment > drm/i915: Split cursor alignment to per-platform vfuncs > drm/i915: Split pre-skl platforms out from intel_surf_alignment() > drm/i915: Move intel_surf_alignment() into skl_univerals_plane.c > drm/i915: Update plane alignment requirements for TGL+ > drm/i915: Nuke the TGL+ chroma plane tile row alignment stuff > > drivers/gpu/drm/drm_atomic.c | 7 +- > drivers/gpu/drm/drm_crtc.c | 6 +- > drivers/gpu/drm/drm_crtc_internal.h | 2 - > drivers/gpu/drm/drm_plane.c | 23 ++- > drivers/gpu/drm/i915/display/i9xx_plane.c | 75 ++++++++- > drivers/gpu/drm/i915/display/intel_cursor.c | 38 +++++ > .../drm/i915/display/intel_display_types.h | 5 + > drivers/gpu/drm/i915/display/intel_fb.c | 151 ++++-------------- > drivers/gpu/drm/i915/display/intel_fb.h | 3 - > drivers/gpu/drm/i915/display/intel_fb_pin.c | 39 +++-- > drivers/gpu/drm/i915/display/intel_fb_pin.h | 3 +- > drivers/gpu/drm/i915/display/intel_fbdev.c | 5 +- > drivers/gpu/drm/i915/display/intel_sprite.c | 26 +++ > .../drm/i915/display/skl_universal_plane.c | 85 +++++++++- > drivers/gpu/drm/xe/display/xe_fb_pin.c | 3 +- > drivers/gpu/drm/xe/display/xe_plane_initial.c | 4 +- Lucas, can you give me an ack for the merging the xe changes via drm-intel? > include/drm/drm_plane.h | 2 + > 17 files changed, 309 insertions(+), 168 deletions(-) > > -- > 2.44.2 -- Ville Syrjälä Intel