Merge tag 'topic/pipe-reorder-2026-04-15' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next

Browse source

drm/i915/display: change pipe allocation order for discrete platforms

This is a topic pull request for changing the pipe allocation order for
discrete platforms from the usual A,B,C,D to A,C,B,D. The goal is to
help pipe joiner configurations that reserve the adjacent pipe as the
secondary pipe without the user space knowing. More details in the
relevant commit message. The CRTC iteration is also changed to remain in
pipe order.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patch.msgid.link/d69501d53c233386d70ed10290af24aafebf434f@intel.com

...

This commit is contained in:

Dave Airlie 2026-04-17 07:32:30 +10:00

parent ca8639fbb3 2c683e9b41

commit 993eb19140

7 changed files with 95 additions and 70 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

49

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

View file

20

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

View file

90

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

View file

3

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

View file

1

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

View file

1

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

View file

1

drivers/gpu/drm/xe/display/xe_display.c

View file