From nobody Sun Sep 28 19:00:06 2025 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF2311D63C0 for ; Sun, 5 Jan 2025 23:00:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736118028; cv=none; b=ngYMAuM+G3oP4BdLZfNTswdZm5Q2w4zNGikiA7H14kK78B6V4IvDfYcDd+kAiwgmiftn+uSHwb5rlIEsMzfpUHwBjFYbR4+bvsY+ZKWtUP0y/9bTTLmp0IOjcxOWL0Mwgu+l1WFc2y/Q7JpSXDs/gKQyWEJAMGdPRUJeTM7WxrQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736118028; c=relaxed/simple; bh=jZgQ8jsx9IvUwfG9AGdf5L+CCi3TiGpXqyw83nnGk6k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LarIZY1ivnOxRdY+ztmtQlq57VDlJNDCbjHaej39yub6ue46d7O7TQTckgjbDzxLtOF8IbpmmzuDNeQvs7LmA0siVCkfMMLBukoEFv4EpfXvOkEuU862Qm1CeQ5clzfB6Y9TvnVr+oMOUY3EGkk1ipEvEaznYcizPHRx3gXEQTc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=z8E1nqYc; arc=none smtp.client-ip=209.85.167.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="z8E1nqYc" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-540218726d5so14355797e87.2 for ; Sun, 05 Jan 2025 15:00:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736118023; x=1736722823; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=GKrjgKCnZKreaXJ2E0ycjM5Ra7ABafmAz9pY9R2DnqQ=; b=z8E1nqYcRynPefkGYD9wlZ/qRsgwXB8GeZtMxHCHDbqYuPfqRTjA0V8kyoX2kZ3fb+ U9MhhN0C8oR3kxN7cGY6dcn9gOocMypzjZLtH4QBUyV/63fOTwxYKU59f65T9ztYMTwF V0UySoqNLoBv4M4vVctjD0S9Kn1yGIsFJhz1zNnLUElJX5bpcPZuonbz2FwuU4e2TtRX 0mjGfcTDw9vkx+OsLQwmWDK31UQ0sX99vfKzdfZUGBBeSwe8BEv/lIpwWB86p40IX4n/ LyL90XgalUwVVJR7c7YBwcwzX2UrGKRDC0g9/zCS1XOjr0UfmhWJ7uSThKedURNtJ3XN gemQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736118023; x=1736722823; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GKrjgKCnZKreaXJ2E0ycjM5Ra7ABafmAz9pY9R2DnqQ=; b=M13CjbL5ATxjBDYTEvLWIh6RSdwvVz9OFCEOH11wR1XaNpx5IjC1MFKSQbRyJUkH0F j0x0zFS40h76hW+z+70MMH4O94bBDvQKZBubqMPtVkhF6cUxT6tPQbyax0e7qgo7J4NB zIZac9y3xfCzesARVIaX+2D76uUqvC65YGpH440RrdEHyLYLGgY4TFysTQr7VPUIusXH YZXStDiEvPj1H67RbTMe5/zlQq2cBfZ29OB9Z06364+pfW30TO1H/4SKd4dAMTrWMYTa exg0ueZMxuh85RVeQppMhxqTz+sw0Kc8xKrtKlCIDgtOZ3p/TbxkrbE/GC7Egt0S/Vb5 GoMA== X-Forwarded-Encrypted: i=1; AJvYcCX+CEmQF/g1EHdSXwQoFPSYMtbrotIYE8HDXc4J87VSl0R1GnAyaqFf0HvXWU0HMAyU4WS6ngc86gJjG+U=@vger.kernel.org X-Gm-Message-State: AOJu0YwzAMVxd4aYzgyoW/huBQsersnL0ffPIDe7LPwvMj2/86aeL7XH 9TmEgceNO/N2PNv9yuCmlO27r1vaEUe4GSfdqSobh2TA0toG2n8eqEOoPOzJtS4= X-Gm-Gg: ASbGncvwnu1PXHJm09DiVSb2N8dmi4u2V1/KWA8RZfCpY/A8mt9frREmzdyc2Nhy810 GX2vPhaPU7MN5NIKxrV9LtYgg0Wkx2tp1ncEBiFueyIp0NYgoE1Vx1M3jQvMeMhgZoNenkgiw6q vp6YXOe3aCuN0mYn4I28FRDgI+QKaGzZvazrzJXnvXohFbWncP5dzWGlhrHPaeSj/Vqw2wfgk3v 5Xcwu/bWudhk/NMdjPbF0dqkl/sJTSMzaR0ddLtjJM/nQ13mOaeUkTj3Cont7sk X-Google-Smtp-Source: AGHT+IGJxgfPUfQOhY6Li6RsbogVRq6RGnpuosjAEzvi+7xDTfLNkIU+jZvZPDSUtn8b1BLQ/xPk1w== X-Received: by 2002:a05:6512:308d:b0:541:3587:9d4d with SMTP id 2adb3069b0e04-54229524687mr16678010e87.7.1736118021787; Sun, 05 Jan 2025 15:00:21 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54223821583sm4614034e87.203.2025.01.05.15.00.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jan 2025 15:00:20 -0800 (PST) From: Dmitry Baryshkov Date: Mon, 06 Jan 2025 01:00:13 +0200 Subject: [PATCH v3 1/2] drm/nouveau: incorporate I2C TV encoder drivers Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250106-nouveau-encoder-slave-v3-1-1d37d2f2c67f@linaro.org> References: <20250106-nouveau-encoder-slave-v3-0-1d37d2f2c67f@linaro.org> In-Reply-To: <20250106-nouveau-encoder-slave-v3-0-1d37d2f2c67f@linaro.org> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Karol Herbst , Lyude Paul , Danilo Krummrich , "James E.J. Bottomley" , Helge Deller , Danilo Krummrich Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, Laurent Pinchart X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=11380; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=jZgQ8jsx9IvUwfG9AGdf5L+CCi3TiGpXqyw83nnGk6k=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnew8AeOvmqiw012/pef6mfb5OTHNE+HIxXeW9q M7jUMaP4waJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ3sPAAAKCRCLPIo+Aiko 1Z7HB/94O6lnA3X34i1T37/4WFh3a6vXNePjVpGOVHZUgDVX51HAXJRB5qtjZXqJOraVoIZJnJA gDBXHK0qgxJTpG56n+/W8BB3gQB/7fKbeasmx7RWZGx8Li9vuokRbxX3rucMLnbeUMv5WshCu3R Ameoh6Gp8rsW7a8PTMfPc/ieOlDBpFXXUf5za26g7HYtQMDRqsb3DsEsZaUWM5YZeAVR+hXRYSU IsNQXIM4vb/SHEIHKKX+HNuaLAY0raV+kZDl06lyBYdxVIeDTmggxLDeLoYLZ/eGOirgBV7zoX8 PkMoYwRJScTslSlHAdzEn+Bd6MdXz/iu/hDXKYjpKjpD6m5P X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A 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: Laurent Pinchart Signed-off-by: Dmitry Baryshkov --- arch/arm/configs/multi_v7_defconfig | 4 ++-- arch/parisc/configs/generic-32bit_defconfig | 4 ++-- arch/parisc/configs/generic-64bit_defconfig | 4 ++-- drivers/gpu/drm/i2c/Kconfig | 18 --------------= ---- drivers/gpu/drm/i2c/Makefile | 6 ------ drivers/gpu/drm/nouveau/Kconfig | 18 ++++++++++++++= ++++ drivers/gpu/drm/nouveau/dispnv04/Kbuild | 2 ++ drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +- drivers/gpu/drm/nouveau/dispnv04/i2c/Kbuild | 5 +++++ .../gpu/drm/{ =3D> nouveau/dispnv04}/i2c/ch7006_drv.c | 0 .../gpu/drm/{ =3D> nouveau/dispnv04}/i2c/ch7006_mode.c | 0 .../gpu/drm/{ =3D> nouveau/dispnv04}/i2c/ch7006_priv.h | 7 ++++--- .../gpu/drm/{ =3D> nouveau/dispnv04}/i2c/sil164_drv.c | 3 ++- drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 2 +- .../gpu/drm/nouveau/include/dispnv04}/i2c/ch7006.h | 4 ++-- .../gpu/drm/nouveau/include/dispnv04}/i2c/sil164.h | 4 ++-- 16 files changed, 43 insertions(+), 40 deletions(-) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v= 7_defconfig index 758276027dbcd0d444dac995745076b4e33457ff..4b100ddb0c54cb8f8ba81758c2f= 59d24f0fe82e9 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -713,10 +713,10 @@ CONFIG_VIDEO_ADV7604_CEC=3Dy CONFIG_VIDEO_ML86V7667=3Dm CONFIG_IMX_IPUV3_CORE=3Dm CONFIG_DRM=3Dy -# CONFIG_DRM_I2C_CH7006 is not set -# CONFIG_DRM_I2C_SIL164 is not set CONFIG_DRM_I2C_NXP_TDA998X=3Dm CONFIG_DRM_NOUVEAU=3Dm +# CONFIG_DRM_NOUVEAU_CH7006 is not set +# CONFIG_DRM_NOUVEAU_SIL164 is not set CONFIG_DRM_EXYNOS=3Dm CONFIG_DRM_EXYNOS_FIMD=3Dy CONFIG_DRM_EXYNOS_MIXER=3Dy diff --git a/arch/parisc/configs/generic-32bit_defconfig b/arch/parisc/conf= igs/generic-32bit_defconfig index 5ce258f3fffaf0e3aac5f8f5450dd65bad305879..f5fffc24c3bc5baf0d77b845e3a= c77fae49b276e 100644 --- a/arch/parisc/configs/generic-32bit_defconfig +++ b/arch/parisc/configs/generic-32bit_defconfig @@ -132,11 +132,11 @@ CONFIG_I2C=3Dy CONFIG_HWMON=3Dm CONFIG_DRM=3Dm CONFIG_DRM_DISPLAY_DP_AUX_CEC=3Dy -# CONFIG_DRM_I2C_CH7006 is not set -# CONFIG_DRM_I2C_SIL164 is not set CONFIG_DRM_RADEON=3Dm CONFIG_DRM_NOUVEAU=3Dm # CONFIG_DRM_NOUVEAU_BACKLIGHT is not set +# CONFIG_DRM_NOUVEAU_CH7006 is not set +# CONFIG_DRM_NOUVEAU_SIL164 is not set CONFIG_DRM_VGEM=3Dm CONFIG_DRM_UDL=3Dm CONFIG_DRM_MGAG200=3Dm diff --git a/arch/parisc/configs/generic-64bit_defconfig b/arch/parisc/conf= igs/generic-64bit_defconfig index 19a804860ed5b355f82396c2314bd0d8f3fb768a..704f68fbf960fb865206c8f8ab1= 751c9f0db6de3 100644 --- a/arch/parisc/configs/generic-64bit_defconfig +++ b/arch/parisc/configs/generic-64bit_defconfig @@ -193,11 +193,11 @@ CONFIG_MEDIA_SUPPORT=3Dm CONFIG_AGP=3Dy CONFIG_AGP_PARISC=3Dy CONFIG_DRM=3Dy -# CONFIG_DRM_I2C_CH7006 is not set -# CONFIG_DRM_I2C_SIL164 is not set CONFIG_DRM_RADEON=3Dy CONFIG_DRM_NOUVEAU=3Dm # CONFIG_DRM_NOUVEAU_BACKLIGHT is not set +# CONFIG_DRM_NOUVEAU_CH7006 is not set +# CONFIG_DRM_NOUVEAU_SIL164 is not set CONFIG_DRM_MGAG200=3Dm CONFIG_FB=3Dy CONFIG_FB_PM2=3Dm diff --git a/drivers/gpu/drm/i2c/Kconfig b/drivers/gpu/drm/i2c/Kconfig index 6f19e1c35e30b0e595c1a60628a6b8cf313fcabc..d5200f67958e68a8ec73401f1d3= b79cbe0aa303d 100644 --- a/drivers/gpu/drm/i2c/Kconfig +++ b/drivers/gpu/drm/i2c/Kconfig @@ -2,24 +2,6 @@ menu "I2C encoder or helper chips" depends on DRM && DRM_KMS_HELPER && I2C =20 -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 diff --git a/drivers/gpu/drm/i2c/Makefile b/drivers/gpu/drm/i2c/Makefile index a962f6f085686674ed33010345730db776815ebe..31fd35527d99d7eb23851d29017= 5a3ff0c756772 100644 --- a/drivers/gpu/drm/i2c/Makefile +++ b/drivers/gpu/drm/i2c/Makefile @@ -1,10 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -ch7006-y :=3D ch7006_drv.o ch7006_mode.o -obj-$(CONFIG_DRM_I2C_CH7006) +=3D ch7006.o - -sil164-y :=3D sil164_drv.o -obj-$(CONFIG_DRM_I2C_SIL164) +=3D sil164.o - tda998x-y :=3D tda998x_drv.o obj-$(CONFIG_DRM_I2C_NXP_TDA998X) +=3D tda998x.o obj-$(CONFIG_DRM_I2C_NXP_TDA9950) +=3D tda9950.o diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kcon= fig index ce840300578d8a4011c448b61caf830cef3805bf..ac76c0787010396af5eda901581= d9894ccda43d0 100644 --- a/drivers/gpu/drm/nouveau/Kconfig +++ b/drivers/gpu/drm/nouveau/Kconfig @@ -109,3 +109,21 @@ config DRM_NOUVEAU_GSP_DEFAULT help Say Y here if you want to use the GSP codepaths by default on Turing and Ampere GPUs. + +config DRM_NOUVEAU_CH7006 + tristate "Chrontel ch7006 TV encoder" + depends on DRM_NOUVEAU + default m + help + Support for Chrontel ch7006 and similar TV encoders. + + This driver is currently only useful if you're also using + the nouveau driver. + +config DRM_NOUVEAU_SIL164 + tristate "Silicon Image sil164 TMDS transmitter" + depends on DRM_NOUVEAU + default m + help + Support for sil164 and similar single-link (or dual-link + when used in pairs) TMDS transmitters. diff --git a/drivers/gpu/drm/nouveau/dispnv04/Kbuild b/drivers/gpu/drm/nouv= eau/dispnv04/Kbuild index 975c4e2269366d57e928eedbbbc669d24744379f..949802882ebd53c15e124c218a0= 92af9693d36bc 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/Kbuild +++ b/drivers/gpu/drm/nouveau/dispnv04/Kbuild @@ -10,3 +10,5 @@ nouveau-y +=3D dispnv04/overlay.o nouveau-y +=3D dispnv04/tvmodesnv17.o nouveau-y +=3D dispnv04/tvnv04.o nouveau-y +=3D dispnv04/tvnv17.o + +include $(src)/dispnv04/i2c/Kbuild diff --git a/drivers/gpu/drm/nouveau/dispnv04/dfp.c b/drivers/gpu/drm/nouve= au/dispnv04/dfp.c index 504c421aa176ef3d944592a0109cb72e21fd47b7..25fa41edcb3c75a1f8d6ae42617= c76640baa27b4 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/dfp.c +++ b/drivers/gpu/drm/nouveau/dispnv04/dfp.c @@ -35,7 +35,7 @@ #include "hw.h" #include "nvreg.h" =20 -#include +#include =20 #include =20 diff --git a/drivers/gpu/drm/nouveau/dispnv04/i2c/Kbuild b/drivers/gpu/drm/= nouveau/dispnv04/i2c/Kbuild new file mode 100644 index 0000000000000000000000000000000000000000..3fddfc97bcb399ef3821c6065e5= 868363883ac74 --- /dev/null +++ b/drivers/gpu/drm/nouveau/dispnv04/i2c/Kbuild @@ -0,0 +1,5 @@ +ch7006-y :=3D dispnv04/i2c/ch7006_drv.o dispnv04/i2c/ch7006_mode.o +obj-$(CONFIG_DRM_NOUVEAU_CH7006) +=3D ch7006.o + +sil164-y :=3D dispnv04/i2c/sil164_drv.o +obj-$(CONFIG_DRM_NOUVEAU_SIL164) +=3D sil164.o diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/nouveau/dis= pnv04/i2c/ch7006_drv.c similarity index 100% rename from drivers/gpu/drm/i2c/ch7006_drv.c rename to drivers/gpu/drm/nouveau/dispnv04/i2c/ch7006_drv.c diff --git a/drivers/gpu/drm/i2c/ch7006_mode.c b/drivers/gpu/drm/nouveau/di= spnv04/i2c/ch7006_mode.c similarity index 100% rename from drivers/gpu/drm/i2c/ch7006_mode.c rename to drivers/gpu/drm/nouveau/dispnv04/i2c/ch7006_mode.c diff --git a/drivers/gpu/drm/i2c/ch7006_priv.h b/drivers/gpu/drm/nouveau/di= spnv04/i2c/ch7006_priv.h similarity index 98% rename from drivers/gpu/drm/i2c/ch7006_priv.h rename to drivers/gpu/drm/nouveau/dispnv04/i2c/ch7006_priv.h index 052bdc48a339df47073ab305f224f96c8630d66c..d7a91e17510f7ea6bd2f087078d= ee73f85de53ee 100644 --- a/drivers/gpu/drm/i2c/ch7006_priv.h +++ b/drivers/gpu/drm/nouveau/dispnv04/i2c/ch7006_priv.h @@ -24,12 +24,13 @@ * */ =20 -#ifndef __DRM_I2C_CH7006_PRIV_H__ -#define __DRM_I2C_CH7006_PRIV_H__ +#ifndef __NOUVEAU_I2C_CH7006_PRIV_H__ +#define __NOUVEAU_I2C_CH7006_PRIV_H__ =20 #include #include -#include + +#include =20 typedef int64_t fixed; #define fixed1 (1LL << 32) diff --git a/drivers/gpu/drm/i2c/sil164_drv.c b/drivers/gpu/drm/nouveau/dis= pnv04/i2c/sil164_drv.c similarity index 99% rename from drivers/gpu/drm/i2c/sil164_drv.c rename to drivers/gpu/drm/nouveau/dispnv04/i2c/sil164_drv.c index c17afa025d9d917892055f8e8765d5f9e6259003..ca488f52a84a02773dac4a270b6= 3544901a0e232 100644 --- a/drivers/gpu/drm/i2c/sil164_drv.c +++ b/drivers/gpu/drm/nouveau/dispnv04/i2c/sil164_drv.c @@ -30,7 +30,8 @@ #include #include #include -#include + +#include =20 struct sil164_priv { struct sil164_encoder_params config; diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c b/drivers/gpu/drm/no= uveau/dispnv04/tvnv04.c index d3014027a8122be499b85459b038fdcce5800720..4ffd8af6bf8bff6f688f87ffede= 7a815bfc0789c 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c +++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c @@ -32,7 +32,7 @@ #include "hw.h" #include =20 -#include +#include =20 static struct nvkm_i2c_bus_probe nv04_tv_encoder_info[] =3D { { diff --git a/include/drm/i2c/ch7006.h b/drivers/gpu/drm/nouveau/include/dis= pnv04/i2c/ch7006.h similarity index 97% rename from include/drm/i2c/ch7006.h rename to drivers/gpu/drm/nouveau/include/dispnv04/i2c/ch7006.h index 5305b9797f938626c8f6c464ddc9bf424a39b4a0..1a6fa405f85b2a0d0f9a4d1c786= defc527fa1d3b 100644 --- a/include/drm/i2c/ch7006.h +++ b/drivers/gpu/drm/nouveau/include/dispnv04/i2c/ch7006.h @@ -24,8 +24,8 @@ * */ =20 -#ifndef __DRM_I2C_CH7006_H__ -#define __DRM_I2C_CH7006_H__ +#ifndef __NOUVEAU_I2C_CH7006_H__ +#define __NOUVEAU_I2C_CH7006_H__ =20 /** * struct ch7006_encoder_params diff --git a/include/drm/i2c/sil164.h b/drivers/gpu/drm/nouveau/include/dis= pnv04/i2c/sil164.h similarity index 96% rename from include/drm/i2c/sil164.h rename to drivers/gpu/drm/nouveau/include/dispnv04/i2c/sil164.h index ddf248693c8be8809777723c272f82af8d334c99..b86750d7abe1c2e7142eac32898= 398475fd42531 100644 --- a/include/drm/i2c/sil164.h +++ b/drivers/gpu/drm/nouveau/include/dispnv04/i2c/sil164.h @@ -24,8 +24,8 @@ * */ =20 -#ifndef __DRM_I2C_SIL164_H__ -#define __DRM_I2C_SIL164_H__ +#ifndef __NOUVEAU_I2C_SIL164_H__ +#define __NOUVEAU_I2C_SIL164_H__ =20 /** * struct sil164_encoder_params --=20 2.39.5