Commit 9a0dfe9b authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Danilo Krummrich
Browse files

drm/nouveau: incorporate I2C TV encoder drivers 



Chrontel CH7006 and Silicon Image sil164 drivers use drm_encoder_slave
interface which is being used only by the nouveau driver. It doesn't
make sense to keep this interface inside the DRM subsystem. In
preparation to moving this set of helpers to the nouveau driver, move
the only two I2C driver that use that interface to the nouveau driver
too.

Suggested-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarDanilo Krummrich <dakr@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20250106-nouveau-encoder-slave-v3-1-1d37d2f2c67f@linaro.org
parent 26d6fd81

arch/arm/configs/multi_v7_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -713,10 +713,10 @@ CONFIG_VIDEO_ADV7604_CEC=y 
CONFIG_VIDEO_ML86V7667=m

CONFIG_IMX_IPUV3_CORE=m

CONFIG_DRM=y

# CONFIG_DRM_I2C_CH7006 is not set

# CONFIG_DRM_I2C_SIL164 is not set

CONFIG_DRM_I2C_NXP_TDA998X=m

CONFIG_DRM_NOUVEAU=m

# CONFIG_DRM_NOUVEAU_CH7006 is not set

# CONFIG_DRM_NOUVEAU_SIL164 is not set

CONFIG_DRM_EXYNOS=m

CONFIG_DRM_EXYNOS_FIMD=y

CONFIG_DRM_EXYNOS_MIXER=y

arch/parisc/configs/generic-32bit_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -132,11 +132,11 @@ CONFIG_I2C=y 
CONFIG_HWMON=m

CONFIG_DRM=m

CONFIG_DRM_DISPLAY_DP_AUX_CEC=y

# CONFIG_DRM_I2C_CH7006 is not set

# CONFIG_DRM_I2C_SIL164 is not set

CONFIG_DRM_RADEON=m

CONFIG_DRM_NOUVEAU=m

# CONFIG_DRM_NOUVEAU_BACKLIGHT is not set

# CONFIG_DRM_NOUVEAU_CH7006 is not set

# CONFIG_DRM_NOUVEAU_SIL164 is not set

CONFIG_DRM_VGEM=m

CONFIG_DRM_UDL=m

CONFIG_DRM_MGAG200=m

arch/parisc/configs/generic-64bit_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -193,11 +193,11 @@ CONFIG_MEDIA_SUPPORT=m 
CONFIG_AGP=y

CONFIG_AGP_PARISC=y

CONFIG_DRM=y

# CONFIG_DRM_I2C_CH7006 is not set

# CONFIG_DRM_I2C_SIL164 is not set

CONFIG_DRM_RADEON=y

CONFIG_DRM_NOUVEAU=m

# CONFIG_DRM_NOUVEAU_BACKLIGHT is not set

# CONFIG_DRM_NOUVEAU_CH7006 is not set

# CONFIG_DRM_NOUVEAU_SIL164 is not set

CONFIG_DRM_MGAG200=m

CONFIG_FB=y

CONFIG_FB_PM2=m

drivers/gpu/drm/i2c/Kconfig

+0 −18
Original line number Diff line number Diff line
@@ -2,24 +2,6 @@ 
menu "I2C encoder or helper chips"

     depends on DRM && DRM_KMS_HELPER && I2C



config DRM_I2C_CH7006

	tristate "Chrontel ch7006 TV encoder"

	default m if DRM_NOUVEAU

	help

	  Support for Chrontel ch7006 and similar TV encoders, found

	  on some nVidia video cards.



	  This driver is currently only useful if you're also using

	  the nouveau driver.



config DRM_I2C_SIL164

	tristate "Silicon Image sil164 TMDS transmitter"

	default m if DRM_NOUVEAU

	help

	  Support for sil164 and similar single-link (or dual-link

	  when used in pairs) TMDS transmitters, used in some nVidia

	  video cards.



config DRM_I2C_NXP_TDA998X

	tristate "NXP Semiconductors TDA998X HDMI encoder"

	default m if DRM_TILCDC

drivers/gpu/drm/i2c/Makefile

+0 −6
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

ch7006-y := ch7006_drv.o ch7006_mode.o

obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o



sil164-y := sil164_drv.o

obj-$(CONFIG_DRM_I2C_SIL164) += sil164.o



tda998x-y := tda998x_drv.o

obj-$(CONFIG_DRM_I2C_NXP_TDA998X) += tda998x.o

obj-$(CONFIG_DRM_I2C_NXP_TDA9950) += tda9950.o