Hi Am 15.04.20 um 09:40 schrieb Daniel Vetter: > Because it is. Yes. OTOH, as much as I appreciate the simplification, I think it should be in a separate series. > > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> > Cc: Alexey Brodkin <abrodkin@xxxxxxxxxxxx> Reviewed-by: Thomas Zimmermann <tzimmermann@xxxxxxx> > --- > 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 0a5cf105ee37..748244b1625b 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1295,7 +1295,7 @@ ARC PGU DRM DRIVER > M: Alexey Brodkin <abrodkin@xxxxxxxxxxxx> > 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@xxxxxxxxxxxxxx> > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > index 4f4e7fa001c1..a0a89025d6fa 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 > -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
Attachment:
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx