From patchwork Wed Dec 15 10:43:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 12677983 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 DB13BC433F5 for ; Wed, 15 Dec 2021 10:46:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=BF161Wx6NfNJz+UhDUQDjB8lQUtJI7G8RUBZBEiBpw0=; b=B5eCngxFDgJxeC XlddmkBpB1/6IbYTxRRn5sRe75XykDzM/+Y/5B0HQAYyk9TOPAla56Ay17hegxiZclFT7XPI38WuE MmpsrZhJx4mq9wU04yZKw0itYjATM+yWUClsEzXYvJysbt3LZ7RcpqSl6JHwQFYE+yr493VkwmlxO MLNZVp0LNWbltZibMDhEWzQQGtl9MvBs6+5Q9fphm/N4qoJwjVZx1D45LO7C5IFNXVBHwpby7hNvH F186D2hV1ByC7v3/0gminPbjp004m2nP9opuI3kcmN1lXuH9DVxr8Z0smAeKtPfnj68i/oRKhEMQF miuEojAD5yTsuB3DmtRg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxRnK-000EEI-0j; Wed, 15 Dec 2021 10:45:58 +0000 Received: from smtp-out2.suse.de ([195.135.220.29]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxRkq-000DGa-7j; Wed, 15 Dec 2021 10:43:28 +0000 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id DF2CC1F3CA; Wed, 15 Dec 2021 10:43:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1639565002; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UHVQrF0DrvdbTi2ewbDCJH7wUtscgyPd+xqtty8zivk=; b=dLSs5c5AKW+9jgb4G/5TZ112euYpcykDgKqxc5Yih6Z6iYCqcdflfw0AMWsYzjcXjH59cx Co0beEqC6BZ5j0Tt1mrBxiIYxrbvsHnmTPpi77HpRQrk7ZZoLBx4NltyIsH65O1pDzHsxd H1DI/yT7NX9Dpx6pY+cU2x1+w8LvTYY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1639565002; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UHVQrF0DrvdbTi2ewbDCJH7wUtscgyPd+xqtty8zivk=; b=jiz9RaYx8ziWvTfRPOb2vfyWR8BITnlobfx1MxAzU199xBoZom7IBZwFZ+6UDcpreIzwIZ B04jo3lDveqp6ZCg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 9922513FC5; Wed, 15 Dec 2021 10:43:22 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id cMWCJMrGuWH1eAAAMHmgww (envelope-from ); Wed, 15 Dec 2021 10:43:22 +0000 From: Thomas Zimmermann To: mripard@kernel.org, maarten.lankhorst@linux.intel.com, airlied@linux.ie, daniel@ffwll.ch, jani.nikula@linux.intel.com Cc: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-tegra@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v2 5/5] drm/dp: Move DisplayPort AUX bus helpers into dp/ Date: Wed, 15 Dec 2021 11:43:17 +0100 Message-Id: <20211215104318.18866-6-tzimmermann@suse.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211215104318.18866-1-tzimmermann@suse.de> References: <20211215104318.18866-1-tzimmermann@suse.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211215_024324_494372_B1641F1F X-CRM114-Status: GOOD ( 10.35 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Move drm_dp_aux_bus.c and its header file into the DP subdirectory and update all users. No functional changes. Signed-off-by: Thomas Zimmermann --- drivers/gpu/drm/Makefile | 2 -- drivers/gpu/drm/bridge/parade-ps8640.c | 2 +- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 2 +- drivers/gpu/drm/dp/Makefile | 2 ++ drivers/gpu/drm/{ => dp}/drm_dp_aux_bus.c | 2 +- drivers/gpu/drm/panel/panel-edp.c | 2 +- drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 2 +- include/drm/{ => dp}/drm_dp_aux_bus.h | 0 8 files changed, 7 insertions(+), 7 deletions(-) rename drivers/gpu/drm/{ => dp}/drm_dp_aux_bus.c (99%) rename include/drm/{ => dp}/drm_dp_aux_bus.h (100%) diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 69be80ef1d31..700abeb4945e 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -31,8 +31,6 @@ drm-$(CONFIG_DEBUG_FS) += drm_debugfs.o drm_debugfs_crc.o drm-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o drm-$(CONFIG_DRM_PRIVACY_SCREEN) += drm_privacy_screen.o drm_privacy_screen_x86.o -obj-$(CONFIG_DRM_DP_AUX_BUS) += drm_dp_aux_bus.o - obj-$(CONFIG_DRM_NOMODESET) += drm_nomodeset.o drm_cma_helper-y := drm_gem_cma_helper.o diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridge/parade-ps8640.c index d6a1adbe57d4..89ac4891459a 100644 --- a/drivers/gpu/drm/bridge/parade-ps8640.c +++ b/drivers/gpu/drm/bridge/parade-ps8640.c @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include #include diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c index 74fcaa0150fd..ceda36c69446 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/gpu/drm/dp/Makefile b/drivers/gpu/drm/dp/Makefile index 5b892aeff5ab..75faffc706b1 100644 --- a/drivers/gpu/drm/dp/Makefile +++ b/drivers/gpu/drm/dp/Makefile @@ -1,5 +1,7 @@ # SPDX-License-Identifier: MIT +obj-$(CONFIG_DRM_DP_AUX_BUS) += drm_dp_aux_bus.o + drm_dp_helper-y := drm_dp.o drm_dp_dual_mode_helper.o drm_dp_helper_mod.o drm_dp_mst_topology.o drm_dp_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o drm_dp_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o diff --git a/drivers/gpu/drm/drm_dp_aux_bus.c b/drivers/gpu/drm/dp/drm_dp_aux_bus.c similarity index 99% rename from drivers/gpu/drm/drm_dp_aux_bus.c rename to drivers/gpu/drm/dp/drm_dp_aux_bus.c index 565edf6b1732..415afce3cf96 100644 --- a/drivers/gpu/drm/drm_dp_aux_bus.c +++ b/drivers/gpu/drm/dp/drm_dp_aux_bus.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include /** diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c index 6a6ca891ee2e..99ca1bd0091c 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include diff --git a/drivers/gpu/drm/panel/panel-samsung-atna33xc20.c b/drivers/gpu/drm/panel/panel-samsung-atna33xc20.c index bffeadaaf9a2..20666b6217e7 100644 --- a/drivers/gpu/drm/panel/panel-samsung-atna33xc20.c +++ b/drivers/gpu/drm/panel/panel-samsung-atna33xc20.c @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/drm/drm_dp_aux_bus.h b/include/drm/dp/drm_dp_aux_bus.h similarity index 100% rename from include/drm/drm_dp_aux_bus.h rename to include/drm/dp/drm_dp_aux_bus.h