Commit 110ed472 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2024-05-08' of... 

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: default avatarDave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fe630414-d13e-4052-86f3-ce3155eb3e44@linux.intel.com
parents c815e4e7 be3f3042

drivers/gpu/drm/Kconfig

+11 −9
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ menuconfig DRM 
	  details.  You should also select and configure AGP

	  (/dev/agpgart) support if it is available for your platform.



if DRM



config DRM_MIPI_DBI

	tristate

	depends on DRM
@@ -74,12 +76,10 @@ config DRM_KUNIT_TEST_HELPERS 


config DRM_KUNIT_TEST

	tristate "KUnit tests for DRM" if !KUNIT_ALL_TESTS

	depends on DRM

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on KUNIT

	depends on MMU

	depends on DRM && KUNIT && MMU

	select DRM_BUDDY

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_EXEC

	select DRM_EXPORT_FOR_TESTS if m

	select DRM_GEM_SHMEM_HELPER
@@ -439,10 +439,6 @@ config DRM_HYPERV 
config DRM_EXPORT_FOR_TESTS

	bool



# Separate option because drm_panel_orientation_quirks.c is shared with fbdev

config DRM_PANEL_ORIENTATION_QUIRKS

	tristate



config DRM_LIB_RANDOM

	bool

	default n
@@ -463,3 +459,9 @@ config DRM_WERROR 
	  this config option is disabled by default.



	  If in doubt, say N.



endif



# Separate option because drm_panel_orientation_quirks.c is shared with fbdev

config DRM_PANEL_ORIENTATION_QUIRKS

	tristate

drivers/gpu/drm/amd/amdgpu/Kconfig

+5 −7
Original line number Diff line number Diff line
@@ -2,15 +2,13 @@ 


config DRM_AMDGPU

	tristate "AMD GPU"

	depends on DRM

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HDCP_HELPER

	depends on DRM_DISPLAY_HDMI_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on MMU

	depends on PCI

	depends on DRM && PCI && MMU

	depends on !UML

	select FW_LOADER

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HDMI_HELPER

	select DRM_DISPLAY_HDCP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_KMS_HELPER

	select DRM_SCHED

	select DRM_TTM

drivers/gpu/drm/bridge/Kconfig

+14 −14
Original line number Diff line number Diff line
@@ -92,11 +92,11 @@ config DRM_FSL_LDB 


config DRM_ITE_IT6505

	tristate "ITE IT6505 DisplayPort bridge"

	depends on DRM_DISPLAY_DP_AUX_BUS

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HDCP_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HDCP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_DISPLAY_DP_AUX_BUS

	select DRM_KMS_HELPER

	select EXTCON

	select CRYPTO
@@ -232,10 +232,10 @@ config DRM_PARADE_PS8622 


config DRM_PARADE_PS8640

	tristate "Parade PS8640 MIPI DSI to eDP Converter"

	depends on DRM_DISPLAY_DP_AUX_BUS

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_DISPLAY_DP_AUX_BUS

	select DRM_KMS_HELPER

	select DRM_MIPI_DSI

	select DRM_PANEL
@@ -319,9 +319,9 @@ config DRM_TOSHIBA_TC358764 


config DRM_TOSHIBA_TC358767

	tristate "Toshiba TC358767 eDP bridge"

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_KMS_HELPER

	select REGMAP_I2C

	select DRM_MIPI_DSI
@@ -342,9 +342,9 @@ config DRM_TOSHIBA_TC358768 


config DRM_TOSHIBA_TC358775

	tristate "Toshiba TC358775 DSI/LVDS bridge"

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_KMS_HELPER

	select REGMAP_I2C

	select DRM_PANEL
@@ -387,15 +387,15 @@ config DRM_TI_SN65DSI83 


config DRM_TI_SN65DSI86

	tristate "TI SN65DSI86 DSI to eDP bridge"

	depends on DRM_DISPLAY_DP_AUX_BUS

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_KMS_HELPER

	select REGMAP_I2C

	select DRM_PANEL

	select DRM_MIPI_DSI

	select AUXILIARY_BUS

	select DRM_DISPLAY_DP_AUX_BUS

	help

	  Texas Instruments SN65DSI86 DSI to eDP Bridge driver

drivers/gpu/drm/bridge/analogix/Kconfig

+9 −9
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config DRM_ANALOGIX_ANX6345

	tristate "Analogix ANX6345 bridge"

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_ANALOGIX_DP

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_KMS_HELPER

	select REGMAP_I2C

	help
@@ -15,9 +15,9 @@ config DRM_ANALOGIX_ANX6345 


config DRM_ANALOGIX_ANX78XX

	tristate "Analogix ANX78XX bridge"

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HELPER

	select DRM_ANALOGIX_DP

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_KMS_HELPER

	select REGMAP_I2C

	help
@@ -28,16 +28,16 @@ config DRM_ANALOGIX_ANX78XX 


config DRM_ANALOGIX_DP

	tristate

	depends on DRM_DISPLAY_HELPER

	depends on DRM



config DRM_ANALOGIX_ANX7625

	tristate "Analogix Anx7625 MIPI to DP interface support"

	depends on DRM

	depends on DRM_DISPLAY_DP_AUX_BUS

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HDCP_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HDCP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_DISPLAY_DP_AUX_BUS

	select DRM_MIPI_DSI

	help

	  ANX7625 is an ultra-low power 4K mobile HD transmitter

drivers/gpu/drm/bridge/cadence/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -23,12 +23,12 @@ endif 


config DRM_CDNS_MHDP8546

	tristate "Cadence DPI/DP bridge"

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HDCP_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HDCP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_KMS_HELPER

	select DRM_PANEL_BRIDGE

	depends on OF

	help

	  Support Cadence DPI to DP bridge. This is an internal

	  bridge and is meant to be directly embedded in a SoC.