Skip to content

Commit 1f863fe

Browse files
airliedairlied
committed
Merge tag 'drm-intel-next-2026-05-14' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next
- A Revert of a Kconfig patch that broke some builds (Jani) - New fb_pin abstraction for xe and i915 fb transparent handling (Ville, Tvrtko) - Skip inactive MST connectors on HDCP cases (Suraj) - Reduce redundant intel_panel_fixed_mode (Ankit) - Some general fixes (Imre, Chaitanya) - Reorganize display documentation (Jani) - Start switching to display specific reg types (Jani) Signed-off-by: Dave Airlie <airlied@redhat.com> From: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://patch.msgid.link/agXbLMtMECnKy-YV@intel.com
2 parents bfdb8fa + ae27bef commit 1f863fe

102 files changed

Lines changed: 1221 additions & 864 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/gpu/drivers.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ GPU Driver Documentation
88
amdgpu/index
99
i915
1010
imagination/index
11+
intel-display/index
1112
mcde
1213
meson
1314
nouveau

‎Documentation/gpu/drm-kms.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2+
.. _drm-kms:
3+
14
=========================
25
Kernel Mode Setting (KMS)
36
=========================

‎Documentation/gpu/i915.rst‎

Lines changed: 7 additions & 195 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2+
.. _drm/i915:
3+
14
===========================
25
drm/i915 Intel GFX Driver
36
===========================
@@ -7,6 +10,9 @@ models) integrated GFX chipsets with both Intel display and rendering
710
blocks. This excludes a set of SoC platforms with an SGX rendering unit,
811
those have basic support through the gma500 drm driver.
912

13+
The display, or :ref:`drm-kms`, support for drm/i915 is provided by
14+
:ref:`drm/intel-display`, and shared with :ref:`drm/xe <drm/xe>`.
15+
1016
Core Driver Infrastructure
1117
==========================
1218

@@ -64,200 +70,6 @@ Workarounds
6470
.. kernel-doc:: drivers/gpu/drm/i915/gt/intel_workarounds.c
6571
:doc: Hardware workarounds
6672

67-
Display Hardware Handling
68-
=========================
69-
70-
This section covers everything related to the display hardware including
71-
the mode setting infrastructure, plane, sprite and cursor handling and
72-
display, output probing and related topics.
73-
74-
Mode Setting Infrastructure
75-
---------------------------
76-
77-
The i915 driver is thus far the only DRM driver which doesn't use the
78-
common DRM helper code to implement mode setting sequences. Thus it has
79-
its own tailor-made infrastructure for executing a display configuration
80-
change.
81-
82-
Frontbuffer Tracking
83-
--------------------
84-
85-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_frontbuffer.c
86-
:doc: frontbuffer tracking
87-
88-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_frontbuffer.h
89-
:internal:
90-
91-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_frontbuffer.c
92-
:internal:
93-
94-
Display FIFO Underrun Reporting
95-
-------------------------------
96-
97-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_fifo_underrun.c
98-
:doc: fifo underrun handling
99-
100-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_fifo_underrun.c
101-
:internal:
102-
103-
Plane Configuration
104-
-------------------
105-
106-
This section covers plane configuration and composition with the primary
107-
plane, sprites, cursors and overlays. This includes the infrastructure
108-
to do atomic vsync'ed updates of all this state and also tightly coupled
109-
topics like watermark setup and computation, framebuffer compression and
110-
panel self refresh.
111-
112-
Atomic Plane Helpers
113-
--------------------
114-
115-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_plane.c
116-
:doc: atomic plane helpers
117-
118-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_plane.c
119-
:internal:
120-
121-
Asynchronous Page Flip
122-
----------------------
123-
124-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_display.c
125-
:doc: asynchronous flip implementation
126-
127-
Output Probing
128-
--------------
129-
130-
This section covers output probing and related infrastructure like the
131-
hotplug interrupt storm detection and mitigation code. Note that the
132-
i915 driver still uses most of the common DRM helper code for output
133-
probing, so those sections fully apply.
134-
135-
Hotplug
136-
-------
137-
138-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_hotplug.c
139-
:doc: Hotplug
140-
141-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_hotplug.c
142-
:internal:
143-
144-
High Definition Audio
145-
---------------------
146-
147-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_audio.c
148-
:doc: High Definition Audio over HDMI and Display Port
149-
150-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_audio.c
151-
:internal:
152-
153-
.. kernel-doc:: include/drm/intel/i915_component.h
154-
:internal:
155-
156-
Intel HDMI LPE Audio Support
157-
----------------------------
158-
159-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_lpe_audio.c
160-
:doc: LPE Audio integration for HDMI or DP playback
161-
162-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_lpe_audio.c
163-
:internal:
164-
165-
Panel Self Refresh PSR (PSR/SRD)
166-
--------------------------------
167-
168-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_psr.c
169-
:doc: Panel Self Refresh (PSR/SRD)
170-
171-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_psr.c
172-
:internal:
173-
174-
Frame Buffer Compression (FBC)
175-
------------------------------
176-
177-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_fbc.c
178-
:doc: Frame Buffer Compression (FBC)
179-
180-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_fbc.c
181-
:internal:
182-
183-
Display Refresh Rate Switching (DRRS)
184-
-------------------------------------
185-
186-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_drrs.c
187-
:doc: Display Refresh Rate Switching (DRRS)
188-
189-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_drrs.c
190-
:internal:
191-
192-
DPIO
193-
----
194-
195-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dpio_phy.c
196-
:doc: DPIO
197-
198-
DMC Firmware Support
199-
--------------------
200-
201-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dmc.c
202-
:doc: DMC Firmware Support
203-
204-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dmc.c
205-
:internal:
206-
207-
DMC Flip Queue
208-
--------------------
209-
210-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_flipq.c
211-
:doc: DMC Flip Queue
212-
213-
DMC wakelock support
214-
--------------------
215-
216-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dmc_wl.c
217-
:doc: DMC wakelock support
218-
219-
Video BIOS Table (VBT)
220-
----------------------
221-
222-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_bios.c
223-
:doc: Video BIOS Table (VBT)
224-
225-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_bios.c
226-
:internal:
227-
228-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_vbt_defs.h
229-
:internal:
230-
231-
Display clocks
232-
--------------
233-
234-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_cdclk.c
235-
:doc: CDCLK / RAWCLK
236-
237-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_cdclk.c
238-
:internal:
239-
240-
Display PLLs
241-
------------
242-
243-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dpll_mgr.c
244-
:doc: Display PLLs
245-
246-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dpll_mgr.c
247-
:internal:
248-
249-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dpll_mgr.h
250-
:internal:
251-
252-
Display State Buffer
253-
--------------------
254-
255-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dsb.c
256-
:doc: DSB
257-
258-
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dsb.c
259-
:internal:
260-
26173
GT Programming
26274
==============
26375

@@ -568,7 +380,7 @@ The HuC FW layout is the same as the GuC one, see `GuC Firmware Layout`_
568380

569381
DMC
570382
---
571-
See `DMC Firmware Support`_
383+
See :ref:`drm/intel-display/dmc`.
572384

573385
Tracing
574386
=======

‎Documentation/gpu/intel-display/async-flip.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.. SPDX-License-Identifier: MIT
2+
.. Copyright © 2026 Intel Corporation
3+
4+
Asynchronous Page Flip
5+
======================
6+
7+
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_display.c
8+
:doc: asynchronous flip implementation

‎Documentation/gpu/intel-display/atomic.rst‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
.. SPDX-License-Identifier: MIT
2+
.. Copyright © 2026 Intel Corporation
3+
4+
Atomic Modeset Support
5+
======================
6+
7+
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_atomic.c
8+
:doc: atomic modeset support
9+
10+
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_atomic.c
11+
:internal:

‎Documentation/gpu/intel-display/audio.rst‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
.. SPDX-License-Identifier: MIT
2+
.. Copyright © 2026 Intel Corporation
3+
4+
High Definition Audio
5+
=====================
6+
7+
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_audio.c
8+
:doc: High Definition Audio over HDMI and Display Port
9+
10+
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_audio.c
11+
:internal:
12+
13+
.. kernel-doc:: include/drm/intel/i915_component.h
14+
:internal:
15+
16+
Intel HDMI LPE Audio Support
17+
============================
18+
19+
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_lpe_audio.c
20+
:doc: LPE Audio integration for HDMI or DP playback
21+
22+
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_lpe_audio.c
23+
:internal:

‎Documentation/gpu/intel-display/casf.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.. SPDX-License-Identifier: MIT
2+
.. Copyright © 2026 Intel Corporation
3+
4+
Content Adaptive Sharpness Filter (CASF)
5+
========================================
6+
7+
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_casf.c
8+
:doc: Content Adaptive Sharpness Filter (CASF)

‎Documentation/gpu/intel-display/cdclk.rst‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
.. SPDX-License-Identifier: MIT
2+
.. Copyright © 2026 Intel Corporation
3+
4+
Display clocks
5+
==============
6+
7+
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_cdclk.c
8+
:doc: CDCLK / RAWCLK
9+
10+
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_cdclk.c
11+
:internal:

‎Documentation/gpu/intel-display/cmtg.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.. SPDX-License-Identifier: MIT
2+
.. Copyright © 2026 Intel Corporation
3+
4+
Common Primary Timing Generator (CMTG)
5+
======================================
6+
7+
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_cmtg.c
8+
:doc: Common Primary Timing Generator (CMTG)

‎Documentation/gpu/intel-display/dmc.rst‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
.. SPDX-License-Identifier: MIT
2+
.. Copyright © 2026 Intel Corporation
3+
4+
.. _drm/intel-display/dmc:
5+
6+
DMC Firmware Support
7+
====================
8+
9+
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dmc.c
10+
:doc: DMC Firmware Support
11+
12+
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dmc.c
13+
:internal:
14+
15+
16+
DMC Flip Queue
17+
==============
18+
19+
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_flipq.c
20+
:doc: DMC Flip Queue
21+
22+
DMC wakelock support
23+
====================
24+
25+
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dmc_wl.c
26+
:doc: DMC wakelock support

0 commit comments

Comments
 (0)