On Mon, Jan 06, 2025 at 01:00:12AM +0200, Dmitry Baryshkov wrote: > The nouveau driver is the only user of the drm_encoder_slave interface. > Demote it from KMS helpers module to the nouveau driver itself, moving > corresponding I2C encoders to be handled by nouveau driver too. > > Ideally those two drivers should be converted to the drm_bridge > interface, but it's unclear if it's worth spending time on that. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx> Applied to drm-misc-next, thanks! > --- > Changes in v3: > - Moved includes to drivers/gpu/drm/nouveau/include/dispnv04/i2c/ > (Danilo) > - Trimmed Kconfig entries to remove mentions of "some nVidia cards" > (Danilo) > - Fixed checkpatch issues related to alignment and code formatting > (Danilo) > - Link to v2: https://lore.kernel.org/r/20241215-nouveau-encoder-slave-v2-0-ef7a0e687242@xxxxxxxxxx > > Changes in v2: > - Renamed symbols in defconfig (Laurent) > - Added missing Kbuild file (Laurent, LKP) > - Renamed guarding defines in include files. > - Dropped mentions of two removed functions. > - Link to v1: https://lore.kernel.org/r/20241214-nouveau-encoder-slave-v1-0-beda767472e3@xxxxxxxxxx > > --- > Dmitry Baryshkov (2): > drm/nouveau: incorporate I2C TV encoder drivers > drm/nouveau: vendor in drm_encoder_slave API > > arch/arm/configs/multi_v7_defconfig | 4 +- > arch/parisc/configs/generic-32bit_defconfig | 4 +- > arch/parisc/configs/generic-64bit_defconfig | 4 +- > drivers/gpu/drm/Makefile | 1 - > drivers/gpu/drm/i2c/Kconfig | 18 --- > drivers/gpu/drm/i2c/Makefile | 6 - > drivers/gpu/drm/nouveau/Kconfig | 18 +++ > drivers/gpu/drm/nouveau/dispnv04/Kbuild | 3 + > drivers/gpu/drm/nouveau/dispnv04/dfp.c | 17 +-- > drivers/gpu/drm/nouveau/dispnv04/i2c/Kbuild | 5 + > .../drm/{ => nouveau/dispnv04}/i2c/ch7006_drv.c | 30 ++--- > .../drm/{ => nouveau/dispnv04}/i2c/ch7006_mode.c | 8 +- > .../drm/{ => nouveau/dispnv04}/i2c/ch7006_priv.h | 11 +- > .../drm/{ => nouveau/dispnv04}/i2c/sil164_drv.c | 33 +++--- > .../dispnv04/nouveau_i2c_encoder.c} | 95 +++++----------- > drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 24 ++-- > drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 4 +- > .../gpu/drm/nouveau/include/dispnv04}/i2c/ch7006.h | 4 +- > .../drm/nouveau/include/dispnv04/i2c/encoder_i2c.h | 121 +++++++++------------ > .../gpu/drm/nouveau/include/dispnv04}/i2c/sil164.h | 4 +- > drivers/gpu/drm/nouveau/nouveau_connector.c | 10 +- > drivers/gpu/drm/nouveau/nouveau_encoder.h | 13 +-- > 22 files changed, 190 insertions(+), 247 deletions(-) > --- > base-commit: 938fbb16aba8f7b88e0fdcf56f315a5bbad41aad > change-id: 20241214-nouveau-encoder-slave-a6dd422fa4a9 > > Best regards, > -- > Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx> >
