Skip to content

drm/i915: Allow the first async flip to change modifier

Ville Syrjala intel-gfx 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest5 patches 1 replyIn review
  2. v16 patches 13 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5drm/i915: Align PLANE_SURF to 16k on ADL for async flipsdrivers/gpu/drm/i915/display/intel_dpt.c drivers/gpu/drm/i915/display/intel_dpt.h drivers/gpu/drm/i915/display/intel_fb.c +1 more+27 -100 replies
2/5drm/i915: Reject async flips if we need to change DDB/watermarksdrivers/gpu/drm/i915/display/skl_watermark.c+12 -00 replies
3/5drm/i915: Allow the initial async flip to change modifierdrivers/gpu/drm/i915/display/intel_atomic_plane.c drivers/gpu/drm/i915/display/intel_display.c+20 -30 replies
4/5drm/i915: Eliminate extra frame from skl-glk sync->async flip changedrivers/gpu/drm/i915/display/i9xx_plane.c drivers/gpu/drm/i915/display/intel_atomic_plane.c drivers/gpu/drm/i915/display/skl_universal_plane.c+21 -41 reply
5/5drm/i915: s/need_async_flip_disable_wa/need_async_flip_toggle_wa/drivers/gpu/drm/i915/display/i9xx_plane.c drivers/gpu/drm/i915/display/intel_atomic_plane.c drivers/gpu/drm/i915/display/intel_display.c +2 more+7 -80 replies

Reviews trailers per patch

All 5 patches have a Reviewed-by or Acked-by.

PatchArun R MurthyVandita Kulkarni
1/5R-b
2/5R-b R-b
3/5R-b
4/5R-b
5/5R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 0/5] drm/i915: Allow the first async flip to change modifier

From: Ville Syrjälä <[email protected]>

Xorg/modesetting expects to be able to change the modifier already when submitting the first async flip. Let's convert the first async flip to a sync flip so that we can accommodate it. For now I limit this behaviour to skl+ since earlier platforms don't support async flips with anything but X-tile anyway, but we could extend this if needed to allow eg. stride changes/etc.

We already convert the first async flip to a sync flip on ADL+ to reprogram the watermarks/DDB, and on BDW-GLK the hardware anyway converts the first async flip to a sync flip (due to the double buffering behaviour of the async flip bit). So actually this will only slow down the first async flip on ICL and TGL.

I've also included a workaround for async flip GGTT/DMAR faults on ADL. Just bumping the alignment to 16k seems effective, and so that seems like a reasonable enough solution for the moment. But this probably needs further analysis later.

v2: Drop the ILK LP_WM refactoring for now as it's unrelated
Otherwise a repost to test against a fixed IGT series

Test-with: [email protected]

Ville Syrjälä (5):
drm/i915: Align PLANE_SURF to 16k on ADL for async flips drm/i915: Reject async flips if we need to change DDB/watermarks drm/i915: Allow the initial async flip to change modifier drm/i915: Eliminate extra frame from skl-glk sync->async flip change drm/i915: s/need_async_flip_disable_wa/need_async_flip_toggle_wa/

 drivers/gpu/drm/i915/display/i9xx_plane.c     |  7 +++++-
 .../gpu/drm/i915/display/intel_atomic_plane.c | 23 ++++++++++++++++---
 drivers/gpu/drm/i915/display/intel_display.c  |  9 +++++++-
 .../drm/i915/display/intel_display_types.h    |  2 +-
 drivers/gpu/drm/i915/display/intel_dpt.c      |  7 +++---
 drivers/gpu/drm/i915/display/intel_dpt.h      |  3 ++-
 drivers/gpu/drm/i915/display/intel_fb.c       | 17 +++++++++++++-
 drivers/gpu/drm/i915/display/intel_fb_pin.c   | 10 ++++----
 .../drm/i915/display/skl_universal_plane.c    |  8 +++++--
 drivers/gpu/drm/i915/display/skl_watermark.c  | 12 ++++++++++
 10 files changed, 80 insertions(+), 18 deletions(-)
Signature · 1 line
2.43.2