From patchwork Sun Dec 15 10:19:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13908711 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9174AE77183 for ; Sun, 15 Dec 2024 10:19:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 926F410E11F; Sun, 15 Dec 2024 10:19:33 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="TqTEV0mI"; dkim-atps=neutral Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by gabe.freedesktop.org (Postfix) with ESMTPS id C2FFE10E11F for ; Sun, 15 Dec 2024 10:19:31 +0000 (UTC) Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-303548a9361so290831fa.0 for ; Sun, 15 Dec 2024 02:19:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734257970; x=1734862770; darn=lists.freedesktop.org; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:from:to:cc:subject:date:message-id:reply-to; bh=XmJRlCgQ43HqhYS9HmW8tiBWnQtuxSsa3zDxVOfvub4=; b=TqTEV0mIqbOjovf/zMBMWet/X1M3C4YuQYi8mZchQEwBlLWYOTIUtUCILpFbMigQSR the01HPVeWKo6bMru1/dtHDV9nzjlGikgL8oL46cJ6+LHuawYrGuPlxiMbSS0GYZ0Rs5 fuxkrwv+gwdnEtwiel8T8PSM8eWOd96oTAkcGau9Kcy5Iiw3wPLisOERjrPHqfis5/hk kEoBo9Khpbw9oastwQh9A+zz/PtRteea+TZOu8MsOp6z3IxmG7kBKeexIthqZR5iznik 8CIUq383TT6b4Q/i36sonOFmJH+RkghipGYfmxyq7T8HFM9DgEVfvzDbPpidVHdhnKRc T29g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734257970; x=1734862770; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=XmJRlCgQ43HqhYS9HmW8tiBWnQtuxSsa3zDxVOfvub4=; b=aJZdDoCIex0op2vblEeeoFVKo2PfImojofxGcxD7qQNiPsUPsh0Apvnw9McZ5gr/z0 +OAgOoUA/qxnPpWHnGAguewxerXfcebO/D8haHQMHn4CCMIGWMV2eBKmRT8wU4jThsqC LW0oLZ4rqny6XQPXoOQbAIYamr2gaai+7yQ/RxIvH1hr3nKbfG3g7nhrTK0vTmTcROjl jJyb7PZ2u407PQFaGUOSq6SYAJs1JC0SF79OT8HZ5Mn4nVexKHGRhpHenk9N058cigIm 9g7Wj/LT0EbjsbQlm7hV+oKEYofQeOeVpJ1ifVmJWfCtute64panf6bhjOjbXn1NRltf wV5A== X-Gm-Message-State: AOJu0YwX8C+Xy3FftcVnQFFi57rGAy30zdJNfN9sJJsYd4Gx8Y/8iAHT 1KNGlnNYbLRSakmVBLEbcZKTzYxIjPId2Xa0K+8LD4wmy1e8jlh8dIVfBv7nsPg= X-Gm-Gg: ASbGncs/LaBpvL5y038vGsT7vPln5XfeVi6IvTFPsZMzdUgqRJPHz/uQAKGkY4gFhSu I9h1mKqE4LEoTj2D6VXfZzOlfXj4W+ZIsjpbcYRkVy8RW0ZOYSXpqjpd1WXFyHKN5d/Fg8yKkGp qDLNqX06UITi8kTshe3FIaS6UYKnzRD7B6TmVN1q+2D0uvWwz8fD2YqG6NWP9QasmeQsnhi1MTJ YlOt0lhO7MVB7krP53z4kZNc/zVV7YLFQWS+ai2EwofrLOtDRGMhSPYEDza/7G4 X-Google-Smtp-Source: AGHT+IGWyXChb/D3B2rPy2AbSmqVSVzMB+hbWmEQo+gBesrAsnI7rlvG3Pz1R9B+snZAh8Q1EO+Auw== X-Received: by 2002:a05:651c:2109:b0:2ff:9b6f:23d9 with SMTP id 38308e7fff4ca-302544268a1mr24067711fa.7.1734257969909; Sun, 15 Dec 2024 02:19:29 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-3034401d546sm5270851fa.11.2024.12.15.02.19.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2024 02:19:28 -0800 (PST) From: Dmitry Baryshkov Subject: [PATCH v2 0/2] drm/nouveau: remove drm_encoder_slave interface Date: Sun, 15 Dec 2024 12:19:22 +0200 Message-Id: <20241215-nouveau-encoder-slave-v2-0-ef7a0e687242@linaro.org> MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIACqtXmcC/4WNQQ6CMBBFr0K6dgwdG4iuvIdhMdIBJiGtmUKjI dzdygVcvpf89zeTWIWTuVWbUc6SJIYCeKpMP1EYGcQXNlijs2gdhLhmphU49NGzQpopM1DjvUM cyNHVlO1LeZD30X10hSdJS9TPcZPtz/4rZgs1PNlT27SuRb7cZwmk8Rx1NN2+71+5zvEQuwAAA A== X-Change-ID: 20241214-nouveau-encoder-slave-a6dd422fa4a9 To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Karol Herbst , Lyude Paul , Danilo Krummrich Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org, Laurent Pinchart X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2501; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=3uERJoyD6tEdmd7Ye5Z7DP4u68QhGn6/3ku1AADiaSo=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnXq0vCch41TAM7WiRPkozL/rQQweK5oSKeHQ4y RBmwJGmxyWJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ16tLwAKCRCLPIo+Aiko 1Yr7B/936nIs6FtfnNKBW5AwyrppVEyPZFGQpirMdY83dKN7czEFsLt8zQYuJU5tJ686XowwX2D UsMiuGW5oAF3GXiXWDW53Z7lYXrepHGepoJvp7Zu21GxssPV9Kzgs9ST8kT+9Uy9DPCDEbRQuF4 ACXVXFxo1jy6ozYd/76xCnjeW/W0rkdI9+GqzWPAmggzy+I/KYwAzN1uM4t7Nk7RAZwKZMthyZS Vo6nRyPasl5RhLttKblMSXeDQEVQC5CzqMSLef9IYMB4vYJ1K1SLtJpI3pzmBLeWhx4JFjwezYG GzShXf1g//MCGCvQp3nx7a25wm4bCjT6e/hY4L/RYo7Ssa0E X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 --- 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@linaro.org --- 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 | 20 ++++ drivers/gpu/drm/nouveau/dispnv04/Kbuild | 3 + drivers/gpu/drm/nouveau/dispnv04/dfp.c | 12 +-- 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} | 85 +++++----------- drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 20 ++-- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 4 +- .../gpu/drm/nouveau/include}/i2c/ch7006.h | 4 +- .../gpu/drm/nouveau/include/i2c/encoder_i2c.h | 109 ++++++++------------- .../gpu/drm/nouveau/include}/i2c/sil164.h | 4 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 6 +- drivers/gpu/drm/nouveau/nouveau_encoder.h | 13 +-- 22 files changed, 172 insertions(+), 232 deletions(-) --- base-commit: 4176cf5c5651c33769de83bb61b0287f4ec7719f change-id: 20241214-nouveau-encoder-slave-a6dd422fa4a9 Best regards,