From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Alexey Brodkin <abrodkin@synopsys.com>,
Daniel Vetter <daniel.vetter@intel.com>
Subject: [PATCH 17/18] drm/arc: Move to drm/tiny
Date: Fri, 17 Jul 2020 11:04:29 +0200 [thread overview]
Message-ID: <20200717090430.1146256-17-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20200717090430.1146256-1-daniel.vetter@ffwll.ch>
Because it is.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
---
MAINTAINERS | 2 +-
drivers/gpu/drm/Kconfig | 2 --
drivers/gpu/drm/Makefile | 1 -
drivers/gpu/drm/arc/Kconfig | 10 ----------
drivers/gpu/drm/arc/Makefile | 3 ---
drivers/gpu/drm/tiny/Kconfig | 10 ++++++++++
drivers/gpu/drm/tiny/Makefile | 1 +
drivers/gpu/drm/{arc/arcpgu_drv.c => tiny/arcpgu.c} | 0
8 files changed, 12 insertions(+), 17 deletions(-)
delete mode 100644 drivers/gpu/drm/arc/Kconfig
delete mode 100644 drivers/gpu/drm/arc/Makefile
rename drivers/gpu/drm/{arc/arcpgu_drv.c => tiny/arcpgu.c} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 415954a98934..0ed6c36004e4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1322,7 +1322,7 @@ ARC PGU DRM DRIVER
M: Alexey Brodkin <abrodkin@synopsys.com>
S: Supported
F: Documentation/devicetree/bindings/display/snps,arcpgu.txt
-F: drivers/gpu/drm/arc/
+F: drivers/gpu/drm/tiny/arcpgu.c
ARCNET NETWORK LAYER
M: Michael Grzeschik <m.grzeschik@pengutronix.de>
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index c4fd57d8b717..d44c6eac2c58 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -354,8 +354,6 @@ source "drivers/gpu/drm/vc4/Kconfig"
source "drivers/gpu/drm/etnaviv/Kconfig"
-source "drivers/gpu/drm/arc/Kconfig"
-
source "drivers/gpu/drm/hisilicon/Kconfig"
source "drivers/gpu/drm/mediatek/Kconfig"
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 2c0e5a7e5953..e69eafbf9e39 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -109,7 +109,6 @@ obj-y += panel/
obj-y += bridge/
obj-$(CONFIG_DRM_FSL_DCU) += fsl-dcu/
obj-$(CONFIG_DRM_ETNAVIV) += etnaviv/
-obj-$(CONFIG_DRM_ARCPGU)+= arc/
obj-y += hisilicon/
obj-$(CONFIG_DRM_ZTE) += zte/
obj-$(CONFIG_DRM_MXSFB) += mxsfb/
diff --git a/drivers/gpu/drm/arc/Kconfig b/drivers/gpu/drm/arc/Kconfig
deleted file mode 100644
index e8f3d63e0b91..000000000000
--- a/drivers/gpu/drm/arc/Kconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-config DRM_ARCPGU
- tristate "ARC PGU"
- depends on DRM && OF
- select DRM_KMS_CMA_HELPER
- select DRM_KMS_HELPER
- help
- Choose this option if you have an ARC PGU controller.
-
- If M is selected the module will be called arcpgu.
diff --git a/drivers/gpu/drm/arc/Makefile b/drivers/gpu/drm/arc/Makefile
deleted file mode 100644
index b26f2495c532..000000000000
--- a/drivers/gpu/drm/arc/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-arcpgu-y := arcpgu_drv.o
-obj-$(CONFIG_DRM_ARCPGU) += arcpgu.o
diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig
index 2b6414f0fa75..9bbaa1a69050 100644
--- a/drivers/gpu/drm/tiny/Kconfig
+++ b/drivers/gpu/drm/tiny/Kconfig
@@ -1,5 +1,15 @@
# SPDX-License-Identifier: GPL-2.0-only
+config DRM_ARCPGU
+ tristate "ARC PGU"
+ depends on DRM && OF
+ select DRM_KMS_CMA_HELPER
+ select DRM_KMS_HELPER
+ help
+ Choose this option if you have an ARC PGU controller.
+
+ If M is selected the module will be called arcpgu.
+
config DRM_CIRRUS_QEMU
tristate "Cirrus driver for QEMU emulated device"
depends on DRM && PCI && MMU
diff --git a/drivers/gpu/drm/tiny/Makefile b/drivers/gpu/drm/tiny/Makefile
index 6ae4e9e5a35f..bef6780bdd6f 100644
--- a/drivers/gpu/drm/tiny/Makefile
+++ b/drivers/gpu/drm/tiny/Makefile
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
+obj-$(CONFIG_DRM_ARCPGU) += arcpgu.o
obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus.o
obj-$(CONFIG_DRM_GM12U320) += gm12u320.o
obj-$(CONFIG_TINYDRM_HX8357D) += hx8357d.o
diff --git a/drivers/gpu/drm/arc/arcpgu_drv.c b/drivers/gpu/drm/tiny/arcpgu.c
similarity index 100%
rename from drivers/gpu/drm/arc/arcpgu_drv.c
rename to drivers/gpu/drm/tiny/arcpgu.c
--
2.27.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-07-17 9:05 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-17 9:04 [PATCH 01/18] drm/armada: Use devm_drm_dev_alloc Daniel Vetter
2020-07-17 9:04 ` [PATCH 02/18] drm/armada: Don't use drm_device->dev_private Daniel Vetter
2020-07-17 9:04 ` [PATCH 03/18] drm/arc: Switch to devm_drm_dev_alloc Daniel Vetter
2020-07-17 9:04 ` [PATCH 04/18] drm/arc: Stop using drm_device->dev_private Daniel Vetter
2020-07-17 9:04 ` [PATCH 05/18] drm/arc: Delete arcpgu_priv->fb Daniel Vetter
2020-07-17 9:04 ` [PATCH 06/18] drm/arc: Embedded a drm_simple_display_pipe Daniel Vetter
2020-07-17 9:04 ` [PATCH 07/18] drm/arc: Embedd a drm_connector for sim case Daniel Vetter
2020-07-17 9:04 ` [PATCH 08/18] drm/arc: Drop surplus connector registration Daniel Vetter
2020-07-17 9:04 ` [PATCH 09/18] drm/arc: Use drmm_mode_config_cleanup Daniel Vetter
2020-07-17 9:04 ` [PATCH 10/18] drm/arc: Align with simple pipe helpers Daniel Vetter
2020-07-17 9:04 ` [PATCH 11/18] drm/arc: Convert to drm_simple_kms_pipe_helper Daniel Vetter
2020-07-17 9:04 ` [PATCH 12/18] drm/arc: Drop crtc check in arc_pgu_update Daniel Vetter
2020-07-17 9:04 ` [PATCH 13/18] drm/arc: Inline arcpgu_crtc.c Daniel Vetter
2020-07-17 9:04 ` [PATCH 14/18] drm/arc: Inline arcpgu_drm_hdmi_init Daniel Vetter
2020-07-17 9:04 ` [PATCH 15/18] drm/arc: Inline remaining files Daniel Vetter
2020-07-17 9:04 ` [PATCH 16/18] drm/arc: Initialize sim connector before display pipe Daniel Vetter
2020-07-17 9:04 ` Daniel Vetter [this message]
2020-07-18 0:33 ` [PATCH 17/18] drm/arc: Move to drm/tiny kernel test robot
2020-07-18 0:33 ` kernel test robot
2020-07-17 9:04 ` [PATCH 18/18] drm/aspeed: Use managed drmm_mode_config_cleanup Daniel Vetter
2020-07-17 9:04 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200717090430.1146256-17-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=abrodkin@synopsys.com \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.