Skip to content

Commit 110ed47

Browse files
airliedairlied
committed
Merge tag 'drm-misc-next-fixes-2024-05-08' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next-fixes for v6.10-rc1: - panthor fixes. - Reverting Kconfig changes, and moving drm options to submenu. - Hide physical fb address in fb helper. - zynqmp bridge fix. - Revert broken ti-sn65dsi83 fix. Signed-off-by: Dave Airlie <[email protected]> From: Maarten Lankhorst <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents c815e4e + be3f304 commit 110ed47

File tree

31 files changed

+172
-160
lines changed

31 files changed

+172
-160
lines changed

‎drivers/gpu/drm/Kconfig‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ menuconfig DRM
2929
details. You should also select and configure AGP
3030
(/dev/agpgart) support if it is available for your platform.
3131

32+
if DRM
33+
3234
config DRM_MIPI_DBI
3335
tristate
3436
depends on DRM
@@ -74,12 +76,10 @@ config DRM_KUNIT_TEST_HELPERS
7476

7577
config DRM_KUNIT_TEST
7678
tristate "KUnit tests for DRM" if !KUNIT_ALL_TESTS
77-
depends on DRM
78-
depends on DRM_DISPLAY_DP_HELPER
79-
depends on DRM_DISPLAY_HELPER
80-
depends on KUNIT
81-
depends on MMU
79+
depends on DRM && KUNIT && MMU
8280
select DRM_BUDDY
81+
select DRM_DISPLAY_DP_HELPER
82+
select DRM_DISPLAY_HELPER
8383
select DRM_EXEC
8484
select DRM_EXPORT_FOR_TESTS if m
8585
select DRM_GEM_SHMEM_HELPER
@@ -439,10 +439,6 @@ config DRM_HYPERV
439439
config DRM_EXPORT_FOR_TESTS
440440
bool
441441

442-
# Separate option because drm_panel_orientation_quirks.c is shared with fbdev
443-
config DRM_PANEL_ORIENTATION_QUIRKS
444-
tristate
445-
446442
config DRM_LIB_RANDOM
447443
bool
448444
default n
@@ -463,3 +459,9 @@ config DRM_WERROR
463459
this config option is disabled by default.
464460

465461
If in doubt, say N.
462+
463+
endif
464+
465+
# Separate option because drm_panel_orientation_quirks.c is shared with fbdev
466+
config DRM_PANEL_ORIENTATION_QUIRKS
467+
tristate

‎drivers/gpu/drm/amd/amdgpu/Kconfig‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22

33
config DRM_AMDGPU
44
tristate "AMD GPU"
5-
depends on DRM
6-
depends on DRM_DISPLAY_DP_HELPER
7-
depends on DRM_DISPLAY_HDCP_HELPER
8-
depends on DRM_DISPLAY_HDMI_HELPER
9-
depends on DRM_DISPLAY_HELPER
10-
depends on MMU
11-
depends on PCI
5+
depends on DRM && PCI && MMU
126
depends on !UML
137
select FW_LOADER
8+
select DRM_DISPLAY_DP_HELPER
9+
select DRM_DISPLAY_HDMI_HELPER
10+
select DRM_DISPLAY_HDCP_HELPER
11+
select DRM_DISPLAY_HELPER
1412
select DRM_KMS_HELPER
1513
select DRM_SCHED
1614
select DRM_TTM

‎drivers/gpu/drm/bridge/Kconfig‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ config DRM_FSL_LDB
9292

9393
config DRM_ITE_IT6505
9494
tristate "ITE IT6505 DisplayPort bridge"
95-
depends on DRM_DISPLAY_DP_AUX_BUS
96-
depends on DRM_DISPLAY_DP_HELPER
97-
depends on DRM_DISPLAY_HDCP_HELPER
98-
depends on DRM_DISPLAY_HELPER
9995
depends on OF
96+
select DRM_DISPLAY_DP_HELPER
97+
select DRM_DISPLAY_HDCP_HELPER
98+
select DRM_DISPLAY_HELPER
99+
select DRM_DISPLAY_DP_AUX_BUS
100100
select DRM_KMS_HELPER
101101
select EXTCON
102102
select CRYPTO
@@ -232,10 +232,10 @@ config DRM_PARADE_PS8622
232232

233233
config DRM_PARADE_PS8640
234234
tristate "Parade PS8640 MIPI DSI to eDP Converter"
235-
depends on DRM_DISPLAY_DP_AUX_BUS
236-
depends on DRM_DISPLAY_DP_HELPER
237-
depends on DRM_DISPLAY_HELPER
238235
depends on OF
236+
select DRM_DISPLAY_DP_HELPER
237+
select DRM_DISPLAY_HELPER
238+
select DRM_DISPLAY_DP_AUX_BUS
239239
select DRM_KMS_HELPER
240240
select DRM_MIPI_DSI
241241
select DRM_PANEL
@@ -319,9 +319,9 @@ config DRM_TOSHIBA_TC358764
319319

320320
config DRM_TOSHIBA_TC358767
321321
tristate "Toshiba TC358767 eDP bridge"
322-
depends on DRM_DISPLAY_DP_HELPER
323-
depends on DRM_DISPLAY_HELPER
324322
depends on OF
323+
select DRM_DISPLAY_DP_HELPER
324+
select DRM_DISPLAY_HELPER
325325
select DRM_KMS_HELPER
326326
select REGMAP_I2C
327327
select DRM_MIPI_DSI
@@ -342,9 +342,9 @@ config DRM_TOSHIBA_TC358768
342342

343343
config DRM_TOSHIBA_TC358775
344344
tristate "Toshiba TC358775 DSI/LVDS bridge"
345-
depends on DRM_DISPLAY_DP_HELPER
346-
depends on DRM_DISPLAY_HELPER
347345
depends on OF
346+
select DRM_DISPLAY_DP_HELPER
347+
select DRM_DISPLAY_HELPER
348348
select DRM_KMS_HELPER
349349
select REGMAP_I2C
350350
select DRM_PANEL
@@ -387,15 +387,15 @@ config DRM_TI_SN65DSI83
387387

388388
config DRM_TI_SN65DSI86
389389
tristate "TI SN65DSI86 DSI to eDP bridge"
390-
depends on DRM_DISPLAY_DP_AUX_BUS
391-
depends on DRM_DISPLAY_DP_HELPER
392-
depends on DRM_DISPLAY_HELPER
393390
depends on OF
391+
select DRM_DISPLAY_DP_HELPER
392+
select DRM_DISPLAY_HELPER
394393
select DRM_KMS_HELPER
395394
select REGMAP_I2C
396395
select DRM_PANEL
397396
select DRM_MIPI_DSI
398397
select AUXILIARY_BUS
398+
select DRM_DISPLAY_DP_AUX_BUS
399399
help
400400
Texas Instruments SN65DSI86 DSI to eDP Bridge driver
401401

‎drivers/gpu/drm/bridge/analogix/Kconfig‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
config DRM_ANALOGIX_ANX6345
33
tristate "Analogix ANX6345 bridge"
4-
depends on DRM_DISPLAY_DP_HELPER
5-
depends on DRM_DISPLAY_HELPER
64
depends on OF
75
select DRM_ANALOGIX_DP
6+
select DRM_DISPLAY_DP_HELPER
7+
select DRM_DISPLAY_HELPER
88
select DRM_KMS_HELPER
99
select REGMAP_I2C
1010
help
@@ -15,9 +15,9 @@ config DRM_ANALOGIX_ANX6345
1515

1616
config DRM_ANALOGIX_ANX78XX
1717
tristate "Analogix ANX78XX bridge"
18-
depends on DRM_DISPLAY_DP_HELPER
19-
depends on DRM_DISPLAY_HELPER
2018
select DRM_ANALOGIX_DP
19+
select DRM_DISPLAY_DP_HELPER
20+
select DRM_DISPLAY_HELPER
2121
select DRM_KMS_HELPER
2222
select REGMAP_I2C
2323
help
@@ -28,16 +28,16 @@ config DRM_ANALOGIX_ANX78XX
2828

2929
config DRM_ANALOGIX_DP
3030
tristate
31-
depends on DRM_DISPLAY_HELPER
31+
depends on DRM
3232

3333
config DRM_ANALOGIX_ANX7625
3434
tristate "Analogix Anx7625 MIPI to DP interface support"
3535
depends on DRM
36-
depends on DRM_DISPLAY_DP_AUX_BUS
37-
depends on DRM_DISPLAY_DP_HELPER
38-
depends on DRM_DISPLAY_HDCP_HELPER
39-
depends on DRM_DISPLAY_HELPER
4036
depends on OF
37+
select DRM_DISPLAY_DP_HELPER
38+
select DRM_DISPLAY_HDCP_HELPER
39+
select DRM_DISPLAY_HELPER
40+
select DRM_DISPLAY_DP_AUX_BUS
4141
select DRM_MIPI_DSI
4242
help
4343
ANX7625 is an ultra-low power 4K mobile HD transmitter

‎drivers/gpu/drm/bridge/cadence/Kconfig‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ endif
2323

2424
config DRM_CDNS_MHDP8546
2525
tristate "Cadence DPI/DP bridge"
26-
depends on DRM_DISPLAY_DP_HELPER
27-
depends on DRM_DISPLAY_HDCP_HELPER
28-
depends on DRM_DISPLAY_HELPER
29-
depends on OF
26+
select DRM_DISPLAY_DP_HELPER
27+
select DRM_DISPLAY_HDCP_HELPER
28+
select DRM_DISPLAY_HELPER
3029
select DRM_KMS_HELPER
3130
select DRM_PANEL_BRIDGE
31+
depends on OF
3232
help
3333
Support Cadence DPI to DP bridge. This is an internal
3434
bridge and is meant to be directly embedded in a SoC.

‎drivers/gpu/drm/bridge/imx/Kconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ config DRM_IMX_LDB_HELPER
55

66
config DRM_IMX8MP_DW_HDMI_BRIDGE
77
tristate "Freescale i.MX8MP HDMI-TX bridge support"
8-
depends on COMMON_CLK
9-
depends on DRM_DW_HDMI
108
depends on OF
9+
depends on COMMON_CLK
10+
select DRM_DW_HDMI
1111
imply DRM_IMX8MP_HDMI_PVI
1212
imply PHY_FSL_SAMSUNG_HDMI_PHY
1313
help

‎drivers/gpu/drm/bridge/synopsys/Kconfig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
config DRM_DW_HDMI
3-
tristate "Synopsys Designware HDMI TX Controller"
4-
depends on DRM_DISPLAY_HDMI_HELPER
5-
depends on DRM_DISPLAY_HELPER
3+
tristate
4+
select DRM_DISPLAY_HDMI_HELPER
5+
select DRM_DISPLAY_HELPER
66
select DRM_KMS_HELPER
77
select REGMAP_MMIO
88
select CEC_CORE if CEC_NOTIFIER

‎drivers/gpu/drm/bridge/ti-sn65dsi83.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,6 @@ static void sn65dsi83_atomic_pre_enable(struct drm_bridge *bridge,
478478
dev_err(ctx->dev, "failed to lock PLL, ret=%i\n", ret);
479479
/* On failure, disable PLL again and exit. */
480480
regmap_write(ctx->regmap, REG_RC_PLL_EN, 0x00);
481-
regulator_disable(ctx->vcc);
482481
return;
483482
}
484483

‎drivers/gpu/drm/display/Kconfig‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
# SPDX-License-Identifier: MIT
22

33
config DRM_DISPLAY_HELPER
4-
tristate "DRM Display Helpers"
4+
tristate
55
depends on DRM
6-
default y
76
help
87
DRM helpers for display adapters.
98

109
config DRM_DISPLAY_DP_AUX_BUS
11-
tristate "DRM DisplayPort AUX bus support"
10+
tristate
1211
depends on DRM
1312
depends on OF || COMPILE_TEST
14-
default y
1513

1614
config DRM_DISPLAY_DP_AUX_CEC
1715
bool "Enable DisplayPort CEC-Tunneling-over-AUX HDMI support"
18-
depends on DRM
19-
depends on DRM_DISPLAY_HELPER
20-
depends on DRM_DISPLAY_DP_HELPER
16+
depends on DRM && DRM_DISPLAY_HELPER
17+
select DRM_DISPLAY_DP_HELPER
2118
select CEC_CORE
2219
help
2320
Choose this option if you want to enable HDMI CEC support for
@@ -27,26 +24,23 @@ config DRM_DISPLAY_DP_AUX_CEC
2724
that do support this they often do not hook up the CEC pin.
2825

2926
config DRM_DISPLAY_DP_AUX_CHARDEV
30-
bool "DRM DisplayPort AUX Interface"
31-
depends on DRM
32-
depends on DRM_DISPLAY_HELPER
33-
depends on DRM_DISPLAY_DP_HELPER
27+
bool "DRM DP AUX Interface"
28+
depends on DRM && DRM_DISPLAY_HELPER
29+
select DRM_DISPLAY_DP_HELPER
3430
help
3531
Choose this option to enable a /dev/drm_dp_auxN node that allows to
3632
read and write values to arbitrary DPCD registers on the DP aux
3733
channel.
3834

3935
config DRM_DISPLAY_DP_HELPER
40-
bool "DRM DisplayPort Helpers"
36+
bool
4137
depends on DRM_DISPLAY_HELPER
42-
select DRM_KMS_HELPER
43-
default y
4438
help
4539
DRM display helpers for DisplayPort.
4640

4741
config DRM_DISPLAY_DP_TUNNEL
48-
bool "DRM DisplayPort tunnels support"
49-
depends on DRM_DISPLAY_DP_HELPER
42+
bool
43+
select DRM_DISPLAY_DP_HELPER
5044
help
5145
Enable support for DisplayPort tunnels. This allows drivers to use
5246
DP tunnel features like the Bandwidth Allocation mode to maximize the
@@ -66,15 +60,13 @@ config DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG
6660
If in doubt, say "N".
6761

6862
config DRM_DISPLAY_HDCP_HELPER
69-
bool "DRM HDCD Helpers"
63+
bool
7064
depends on DRM_DISPLAY_HELPER
71-
default y
7265
help
7366
DRM display helpers for HDCP.
7467

7568
config DRM_DISPLAY_HDMI_HELPER
76-
bool "DRM HDMI Helpers"
69+
bool
7770
depends on DRM_DISPLAY_HELPER
78-
default y
7971
help
8072
DRM display helpers for HDMI.

‎drivers/gpu/drm/drm_fb_dma_helper.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,9 @@ int drm_fb_dma_get_scanout_buffer(struct drm_plane *plane,
167167
struct drm_gem_dma_object *dma_obj;
168168
struct drm_framebuffer *fb;
169169

170+
if (!plane->state || !plane->state->fb)
171+
return -EINVAL;
172+
170173
fb = plane->state->fb;
171174
/* Only support linear modifier */
172175
if (fb->modifier != DRM_FORMAT_MOD_LINEAR)

0 commit comments

Comments
 (0)