| From 3e8ff6efbde6b6b056d6ed6f714140f88dd23dc3 Mon Sep 17 00:00:00 2001 |
| From: Thomas Zimmermann <tzimmermann@suse.de> |
| Date: Fri, 14 Jan 2022 12:45:35 +0100 |
| Subject: [PATCH] FROMGIT: drm/dp: Move DisplayPort AUX bus helpers into dp/ |
| |
| 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 <tzimmermann@suse.de> |
| Acked-by: Daniel Vetter <daniel@ffwll.ch> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20220114114535.29157-6-tzimmermann@suse.de |
| (cherry picked from commit 032a125904995985334766911de9e26ee2bbd646 |
| git://anongit.freedesktop.org/drm/drm-misc drm-misc-next) |
| |
| BUG=b:215432805 |
| TEST=Future patches easier to pick |
| |
| Signed-off-by: Douglas Anderson <dianders@chromium.org> |
| Change-Id: I5bcd62074f58b525f74c1df6044a500e97578c8b |
| Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3470719 |
| Reviewed-by: Sean Paul <seanpaul@chromium.org> |
| Reviewed-by: Drew Davenport <ddavenport@chromium.org> |
| --- |
| 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}/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 |
| 7 files changed, 5 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 301a44dc18e3..27c917020949 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 818704bf5e86..443380c10fd9 100644 |
| --- a/drivers/gpu/drm/bridge/parade-ps8640.c |
| +++ b/drivers/gpu/drm/bridge/parade-ps8640.c |
| @@ -14,7 +14,7 @@ |
| #include <linux/regulator/consumer.h> |
| |
| #include <drm/drm_bridge.h> |
| -#include <drm/drm_dp_aux_bus.h> |
| +#include <drm/dp/drm_dp_aux_bus.h> |
| #include <drm/drm_dp_helper.h> |
| #include <drm/drm_mipi_dsi.h> |
| #include <drm/drm_of.h> |
| diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c |
| index dab8f76618f3..33c52c0c0d16 100644 |
| --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c |
| +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c |
| @@ -26,7 +26,7 @@ |
| #include <drm/drm_atomic.h> |
| #include <drm/drm_atomic_helper.h> |
| #include <drm/drm_bridge.h> |
| -#include <drm/drm_dp_aux_bus.h> |
| +#include <drm/dp/drm_dp_aux_bus.h> |
| #include <drm/drm_dp_helper.h> |
| #include <drm/drm_mipi_dsi.h> |
| #include <drm/drm_of.h> |
| 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 298ea7a49591..80b399e35391 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 <linux/pm_domain.h> |
| #include <linux/pm_runtime.h> |
| |
| -#include <drm/drm_dp_aux_bus.h> |
| +#include <drm/dp/drm_dp_aux_bus.h> |
| #include <drm/drm_dp_helper.h> |
| |
| /** |
| diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c |
| index ba08e8a833f6..bfd033f3c849 100644 |
| --- a/drivers/gpu/drm/panel/panel-edp.c |
| +++ b/drivers/gpu/drm/panel/panel-edp.c |
| @@ -36,7 +36,7 @@ |
| |
| #include <drm/drm_crtc.h> |
| #include <drm/drm_device.h> |
| -#include <drm/drm_dp_aux_bus.h> |
| +#include <drm/dp/drm_dp_aux_bus.h> |
| #include <drm/drm_dp_helper.h> |
| #include <drm/drm_panel.h> |
| |
| diff --git a/drivers/gpu/drm/panel/panel-samsung-atna33xc20.c b/drivers/gpu/drm/panel/panel-samsung-atna33xc20.c |
| index 221db6512859..e09df054b86b 100644 |
| --- a/drivers/gpu/drm/panel/panel-samsung-atna33xc20.c |
| +++ b/drivers/gpu/drm/panel/panel-samsung-atna33xc20.c |
| @@ -14,7 +14,7 @@ |
| #include <linux/pm_runtime.h> |
| #include <linux/regulator/consumer.h> |
| |
| -#include <drm/drm_dp_aux_bus.h> |
| +#include <drm/dp/drm_dp_aux_bus.h> |
| #include <drm/drm_dp_helper.h> |
| #include <drm/drm_edid.h> |
| #include <drm/drm_panel.h> |
| 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 |
| -- |
| 2.35.1.574.g5d30c73bfb-goog |
| |
