From patchwork Sat Jul 16 18:17:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 12920218 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 75244C43334 for ; Sat, 16 Jul 2022 18:18:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B1245113BD0; Sat, 16 Jul 2022 18:18:11 +0000 (UTC) Received: from mailrelay2-1.pub.mailoutpod1-cph3.one.com (mailrelay2-1.pub.mailoutpod1-cph3.one.com [46.30.210.183]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3039E113BD0 for ; Sat, 16 Jul 2022 18:18:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravnborg.org; s=rsa1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=Y2EBEMOUkjRYIPPCsw9QRzUwY0jsSZ1lhOMjP5+onwk=; b=XyFefESDWFSsfXkOUooFiAdi3glUJRG/Z/PPEQnouo8+8sTeWz+ujFG8MTrLV7c0x9zb0RDG0aMFO I54PdDWFLjG60uXvDO4CfZB0aSPRuDRq85yiXrqW9JIT6/xhl0Xjhrt/iDi8XQMbjw4IZwJh9uSjS2 dbVFhU4LzlVsx0lMFsbepAcH+j1i+RX86BYrbB9c0AEdkGKctSClWEJH/p9Mfe8OgagqPkiLq2/rI+ W+Ji66Ra5Z0KRorZ/isRE8Iy6R5OELvXNrW034/3L8f8Y6ToEydQ13BYoKlbHTy9aXN2eAmlrqlrCG 5FFQQ3ZsTAi69pFBgb3Cvgm2UfeKXcg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ravnborg.org; s=ed1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=Y2EBEMOUkjRYIPPCsw9QRzUwY0jsSZ1lhOMjP5+onwk=; b=4/3voBOUj1wZUSu1Wdo61M5fGiB0/4qKzEfZMUAJkQ9gT/nfUBxPDnALYzs8D0rq4J8Yita8tb0ck jBM6s4CBg== X-HalOne-Cookie: 09117c8d1a6b2a81d59a3bc01a8874914c5b513a X-HalOne-ID: a3d2efa7-0533-11ed-a917-d0431ea8a290 Received: from mailproxy1.cst.dirpod3-cph3.one.com (2-105-2-98-cable.dk.customer.tdc.net [2.105.2.98]) by mailrelay2.pub.mailoutpod1-cph3.one.com (Halon) with ESMTPSA id a3d2efa7-0533-11ed-a917-d0431ea8a290; Sat, 16 Jul 2022 18:18:06 +0000 (UTC) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v1 01/11] drm: rename DRIVER_LEGACY to DRIVER_DRI1 Date: Sat, 16 Jul 2022 20:17:40 +0200 Message-Id: <20220716181750.3874838-2-sam@ravnborg.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220716181750.3874838-1-sam@ravnborg.org> References: <20220716181750.3874838-1-sam@ravnborg.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Javier Martinez Canillas , Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" "legacy" is a general term - be specific and use the term dri1. The first step is to rename DRIVER_LEGACY to DRIVER_DRI1. Suggested-by: Javier Martinez Canillas Signed-off-by: Sam Ravnborg Reviewed-by: Javier Martinez Canillas --- drivers/gpu/drm/drm_agpsupport.c | 4 ++-- drivers/gpu/drm/drm_bufs.c | 22 +++++++++++----------- drivers/gpu/drm/drm_context.c | 24 ++++++++++++------------ drivers/gpu/drm/drm_dma.c | 4 ++-- drivers/gpu/drm/drm_drv.c | 2 +- drivers/gpu/drm/drm_file.c | 8 ++++---- drivers/gpu/drm/drm_ioctl.c | 2 +- drivers/gpu/drm/drm_irq.c | 6 +++--- drivers/gpu/drm/drm_legacy_misc.c | 2 +- drivers/gpu/drm/drm_lock.c | 6 +++--- drivers/gpu/drm/drm_pci.c | 8 ++++---- drivers/gpu/drm/drm_scatter.c | 6 +++--- drivers/gpu/drm/drm_vblank.c | 4 ++-- drivers/gpu/drm/i810/i810_drv.c | 2 +- drivers/gpu/drm/mga/mga_drv.c | 2 +- drivers/gpu/drm/r128/r128_drv.c | 2 +- drivers/gpu/drm/savage/savage_drv.c | 2 +- drivers/gpu/drm/sis/sis_drv.c | 2 +- drivers/gpu/drm/tdfx/tdfx_drv.c | 2 +- drivers/gpu/drm/via/via_dri1.c | 2 +- include/drm/drm_device.h | 2 +- include/drm/drm_drv.h | 6 +++--- 22 files changed, 60 insertions(+), 60 deletions(-) diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c index a4ad6fd13abc..b7f6bbe7e340 100644 --- a/drivers/gpu/drm/drm_agpsupport.c +++ b/drivers/gpu/drm/drm_agpsupport.c @@ -422,7 +422,7 @@ EXPORT_SYMBOL(drm_legacy_agp_init); * intact so it can still be used. It is safe to call this if AGP is disabled or * was already removed. * - * Cleanup is only done for drivers who have DRIVER_LEGACY set. + * Cleanup is only done for drivers who have DRIVER_DRI1 set. */ void drm_legacy_agp_clear(struct drm_device *dev) { @@ -430,7 +430,7 @@ void drm_legacy_agp_clear(struct drm_device *dev) if (!dev->agp) return; - if (!drm_core_check_feature(dev, DRIVER_LEGACY)) + if (!drm_core_check_feature(dev, DRIVER_DRI1)) return; list_for_each_entry_safe(entry, tempe, &dev->agp->memory, head) { diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index fcca21e8efac..8cc134d1c26a 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -424,7 +424,7 @@ int drm_legacy_addmap_ioctl(struct drm_device *dev, void *data, return -EPERM; if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && - !drm_core_check_feature(dev, DRIVER_LEGACY)) + !drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; err = drm_addmap_core(dev, map->offset, map->size, map->type, @@ -470,7 +470,7 @@ int drm_legacy_getmap_ioctl(struct drm_device *dev, void *data, int i; if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && - !drm_core_check_feature(dev, DRIVER_LEGACY)) + !drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; idx = map->offset; @@ -571,7 +571,7 @@ EXPORT_SYMBOL(drm_legacy_rmmap_locked); void drm_legacy_rmmap(struct drm_device *dev, struct drm_local_map *map) { if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && - !drm_core_check_feature(dev, DRIVER_LEGACY)) + !drm_core_check_feature(dev, DRIVER_DRI1)) return; mutex_lock(&dev->struct_mutex); @@ -584,7 +584,7 @@ void drm_legacy_master_rmmaps(struct drm_device *dev, struct drm_master *master) { struct drm_map_list *r_list, *list_temp; - if (!drm_core_check_feature(dev, DRIVER_LEGACY)) + if (!drm_core_check_feature(dev, DRIVER_DRI1)) return; mutex_lock(&dev->struct_mutex); @@ -629,7 +629,7 @@ int drm_legacy_rmmap_ioctl(struct drm_device *dev, void *data, int ret; if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && - !drm_core_check_feature(dev, DRIVER_LEGACY)) + !drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; mutex_lock(&dev->struct_mutex); @@ -1276,7 +1276,7 @@ int drm_legacy_addbufs(struct drm_device *dev, void *data, struct drm_buf_desc *request = data; int ret; - if (!drm_core_check_feature(dev, DRIVER_LEGACY)) + if (!drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA)) @@ -1322,7 +1322,7 @@ int __drm_legacy_infobufs(struct drm_device *dev, int i; int count; - if (!drm_core_check_feature(dev, DRIVER_LEGACY)) + if (!drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA)) @@ -1412,7 +1412,7 @@ int drm_legacy_markbufs(struct drm_device *dev, void *data, int order; struct drm_buf_entry *entry; - if (!drm_core_check_feature(dev, DRIVER_LEGACY)) + if (!drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA)) @@ -1460,7 +1460,7 @@ int drm_legacy_freebufs(struct drm_device *dev, void *data, int idx; struct drm_buf *buf; - if (!drm_core_check_feature(dev, DRIVER_LEGACY)) + if (!drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA)) @@ -1516,7 +1516,7 @@ int __drm_legacy_mapbufs(struct drm_device *dev, void *data, int *p, unsigned long virtual; int i; - if (!drm_core_check_feature(dev, DRIVER_LEGACY)) + if (!drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA)) @@ -1607,7 +1607,7 @@ int drm_legacy_mapbufs(struct drm_device *dev, void *data, int drm_legacy_dma_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv) { - if (!drm_core_check_feature(dev, DRIVER_LEGACY)) + if (!drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; if (dev->driver->dma_ioctl) diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c index c6e6a3e7219a..97564097d130 100644 --- a/drivers/gpu/drm/drm_context.c +++ b/drivers/gpu/drm/drm_context.c @@ -60,7 +60,7 @@ struct drm_ctx_list { void drm_legacy_ctxbitmap_free(struct drm_device * dev, int ctx_handle) { if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && - !drm_core_check_feature(dev, DRIVER_LEGACY)) + !drm_core_check_feature(dev, DRIVER_DRI1)) return; mutex_lock(&dev->struct_mutex); @@ -98,7 +98,7 @@ static int drm_legacy_ctxbitmap_next(struct drm_device * dev) void drm_legacy_ctxbitmap_init(struct drm_device * dev) { if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && - !drm_core_check_feature(dev, DRIVER_LEGACY)) + !drm_core_check_feature(dev, DRIVER_DRI1)) return; idr_init(&dev->ctx_idr); @@ -115,7 +115,7 @@ void drm_legacy_ctxbitmap_init(struct drm_device * dev) void drm_legacy_ctxbitmap_cleanup(struct drm_device * dev) { if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && - !drm_core_check_feature(dev, DRIVER_LEGACY)) + !drm_core_check_feature(dev, DRIVER_DRI1)) return; mutex_lock(&dev->struct_mutex); @@ -137,7 +137,7 @@ void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file) struct drm_ctx_list *pos, *tmp; if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && - !drm_core_check_feature(dev, DRIVER_LEGACY)) + !drm_core_check_feature(dev, DRIVER_DRI1)) return; mutex_lock(&dev->ctxlist_mutex); @@ -183,7 +183,7 @@ int drm_legacy_getsareactx(struct drm_device *dev, void *data, struct drm_map_list *_entry; if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && - !drm_core_check_feature(dev, DRIVER_LEGACY)) + !drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; mutex_lock(&dev->struct_mutex); @@ -231,7 +231,7 @@ int drm_legacy_setsareactx(struct drm_device *dev, void *data, struct drm_map_list *r_list = NULL; if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && - !drm_core_check_feature(dev, DRIVER_LEGACY)) + !drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; mutex_lock(&dev->struct_mutex); @@ -336,7 +336,7 @@ int drm_legacy_resctx(struct drm_device *dev, void *data, int i; if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && - !drm_core_check_feature(dev, DRIVER_LEGACY)) + !drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; if (res->count >= DRM_RESERVED_CONTEXTS) { @@ -371,7 +371,7 @@ int drm_legacy_addctx(struct drm_device *dev, void *data, int tmp_handle; if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && - !drm_core_check_feature(dev, DRIVER_LEGACY)) + !drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; tmp_handle = drm_legacy_ctxbitmap_next(dev); @@ -420,7 +420,7 @@ int drm_legacy_getctx(struct drm_device *dev, void *data, struct drm_ctx *ctx = data; if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && - !drm_core_check_feature(dev, DRIVER_LEGACY)) + !drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; /* This is 0, because we don't handle any context flags */ @@ -446,7 +446,7 @@ int drm_legacy_switchctx(struct drm_device *dev, void *data, struct drm_ctx *ctx = data; if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && - !drm_core_check_feature(dev, DRIVER_LEGACY)) + !drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; DRM_DEBUG("%d\n", ctx->handle); @@ -470,7 +470,7 @@ int drm_legacy_newctx(struct drm_device *dev, void *data, struct drm_ctx *ctx = data; if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && - !drm_core_check_feature(dev, DRIVER_LEGACY)) + !drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; DRM_DEBUG("%d\n", ctx->handle); @@ -496,7 +496,7 @@ int drm_legacy_rmctx(struct drm_device *dev, void *data, struct drm_ctx *ctx = data; if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && - !drm_core_check_feature(dev, DRIVER_LEGACY)) + !drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; DRM_DEBUG("%d\n", ctx->handle); diff --git a/drivers/gpu/drm/drm_dma.c b/drivers/gpu/drm/drm_dma.c index eb6b741a6f99..c6b80a618e5e 100644 --- a/drivers/gpu/drm/drm_dma.c +++ b/drivers/gpu/drm/drm_dma.c @@ -54,7 +54,7 @@ int drm_legacy_dma_setup(struct drm_device *dev) int i; if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA) || - !drm_core_check_feature(dev, DRIVER_LEGACY)) + !drm_core_check_feature(dev, DRIVER_DRI1)) return 0; dev->buf_use = 0; @@ -85,7 +85,7 @@ void drm_legacy_dma_takedown(struct drm_device *dev) int i, j; if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA) || - !drm_core_check_feature(dev, DRIVER_LEGACY)) + !drm_core_check_feature(dev, DRIVER_DRI1)) return; if (!dma) diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 8214a0b1ab7f..45e6a48ac110 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -933,7 +933,7 @@ EXPORT_SYMBOL(drm_dev_register); */ void drm_dev_unregister(struct drm_device *dev) { - if (drm_core_check_feature(dev, DRIVER_LEGACY)) + if (drm_core_check_feature(dev, DRIVER_DRI1)) drm_lastclose(dev); dev->registered = false; diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c index ed25168619fc..c6781afe41cf 100644 --- a/drivers/gpu/drm/drm_file.c +++ b/drivers/gpu/drm/drm_file.c @@ -63,7 +63,7 @@ bool drm_dev_needs_global_mutex(struct drm_device *dev) * bother. They also still need BKL locking for their ioctls, so better * safe than sorry. */ - if (drm_core_check_feature(dev, DRIVER_LEGACY)) + if (drm_core_check_feature(dev, DRIVER_DRI1)) return true; /* @@ -256,12 +256,12 @@ void drm_file_free(struct drm_file *file) atomic_read(&dev->open_count)); #ifdef CONFIG_DRM_LEGACY - if (drm_core_check_feature(dev, DRIVER_LEGACY) && + if (drm_core_check_feature(dev, DRIVER_DRI1) && dev->driver->preclose) dev->driver->preclose(dev, file); #endif - if (drm_core_check_feature(dev, DRIVER_LEGACY)) + if (drm_core_check_feature(dev, DRIVER_DRI1)) drm_legacy_lock_release(dev, file->filp); if (drm_core_check_feature(dev, DRIVER_HAVE_DMA)) @@ -461,7 +461,7 @@ void drm_lastclose(struct drm_device * dev) dev->driver->lastclose(dev); DRM_DEBUG("driver lastclose completed\n"); - if (drm_core_check_feature(dev, DRIVER_LEGACY)) + if (drm_core_check_feature(dev, DRIVER_DRI1)) drm_legacy_dev_reinit(dev); drm_client_dev_restore(dev); diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index ca2a6e6101dc..ab36c689f19f 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -783,7 +783,7 @@ long drm_ioctl_kernel(struct file *file, drm_ioctl_t *func, void *kdata, return retcode; /* Enforce sane locking for modern driver ioctls. */ - if (likely(!drm_core_check_feature(dev, DRIVER_LEGACY)) || + if (likely(!drm_core_check_feature(dev, DRIVER_DRI1)) || (flags & DRM_UNLOCKED)) retcode = func(dev, kdata, file_priv); else { diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index d327638e15ee..ac7042db24dc 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -102,7 +102,7 @@ static int drm_legacy_irq_install(struct drm_device *dev, int irq) if (ret < 0) { dev->irq_enabled = false; - if (drm_core_check_feature(dev, DRIVER_LEGACY)) + if (drm_core_check_feature(dev, DRIVER_DRI1)) vga_client_unregister(to_pci_dev(dev->dev)); free_irq(irq, dev); } else { @@ -148,7 +148,7 @@ int drm_legacy_irq_uninstall(struct drm_device *dev) DRM_DEBUG("irq=%d\n", dev->irq); - if (drm_core_check_feature(dev, DRIVER_LEGACY)) + if (drm_core_check_feature(dev, DRIVER_DRI1)) vga_client_unregister(to_pci_dev(dev->dev)); if (dev->driver->irq_uninstall) @@ -173,7 +173,7 @@ int drm_legacy_irq_control(struct drm_device *dev, void *data, if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) return 0; - if (!drm_core_check_feature(dev, DRIVER_LEGACY)) + if (!drm_core_check_feature(dev, DRIVER_DRI1)) return 0; /* UMS was only ever supported on pci devices. */ if (WARN_ON(!dev_is_pci(dev->dev))) diff --git a/drivers/gpu/drm/drm_legacy_misc.c b/drivers/gpu/drm/drm_legacy_misc.c index d4c5434062d7..a33e4adf6974 100644 --- a/drivers/gpu/drm/drm_legacy_misc.c +++ b/drivers/gpu/drm/drm_legacy_misc.c @@ -59,7 +59,7 @@ int drm_legacy_setup(struct drm_device * dev) int ret; if (dev->driver->firstopen && - drm_core_check_feature(dev, DRIVER_LEGACY)) { + drm_core_check_feature(dev, DRIVER_DRI1)) { ret = dev->driver->firstopen(dev); if (ret != 0) return ret; diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c index 1efbd5389d89..c2ad6b34f247 100644 --- a/drivers/gpu/drm/drm_lock.c +++ b/drivers/gpu/drm/drm_lock.c @@ -169,7 +169,7 @@ int drm_legacy_lock(struct drm_device *dev, void *data, struct drm_master *master = file_priv->master; int ret = 0; - if (!drm_core_check_feature(dev, DRIVER_LEGACY)) + if (!drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; ++file_priv->lock_count; @@ -259,7 +259,7 @@ int drm_legacy_unlock(struct drm_device *dev, void *data, struct drm_file *file_ struct drm_lock *lock = data; struct drm_master *master = file_priv->master; - if (!drm_core_check_feature(dev, DRIVER_LEGACY)) + if (!drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; if (lock->context == DRM_KERNEL_CONTEXT) { @@ -354,7 +354,7 @@ void drm_legacy_lock_release(struct drm_device *dev, struct file *filp) void drm_legacy_lock_master_cleanup(struct drm_device *dev, struct drm_master *master) { - if (!drm_core_check_feature(dev, DRIVER_LEGACY)) + if (!drm_core_check_feature(dev, DRIVER_DRI1)) return; /* diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index 39d35fc3a43b..eb0656db08a2 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c @@ -107,7 +107,7 @@ int drm_legacy_irq_by_busid(struct drm_device *dev, void *data, { struct drm_irq_busid *p = data; - if (!drm_core_check_feature(dev, DRIVER_LEGACY)) + if (!drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; /* UMS was only ever support on PCI devices. */ @@ -171,7 +171,7 @@ static int drm_legacy_get_pci_dev(struct pci_dev *pdev, if (ret) goto err_agp; - if (drm_core_check_feature(dev, DRIVER_LEGACY)) { + if (drm_core_check_feature(dev, DRIVER_DRI1)) { mutex_lock(&legacy_dev_list_lock); list_add_tail(&dev->legacy_dev_list, &legacy_dev_list); mutex_unlock(&legacy_dev_list_lock); @@ -205,7 +205,7 @@ int drm_legacy_pci_init(const struct drm_driver *driver, DRM_DEBUG("\n"); - if (WARN_ON(!(driver->driver_features & DRIVER_LEGACY))) + if (WARN_ON(!(driver->driver_features & DRIVER_DRI1))) return -EINVAL; /* If not using KMS, fall back to stealth mode manual scanning. */ @@ -249,7 +249,7 @@ void drm_legacy_pci_exit(const struct drm_driver *driver, DRM_DEBUG("\n"); - if (!(driver->driver_features & DRIVER_LEGACY)) { + if (!(driver->driver_features & DRIVER_DRI1)) { WARN_ON(1); } else { mutex_lock(&legacy_dev_list_lock); diff --git a/drivers/gpu/drm/drm_scatter.c b/drivers/gpu/drm/drm_scatter.c index f4e6184d1877..bc213ffb98e7 100644 --- a/drivers/gpu/drm/drm_scatter.c +++ b/drivers/gpu/drm/drm_scatter.c @@ -64,7 +64,7 @@ static void drm_sg_cleanup(struct drm_sg_mem * entry) void drm_legacy_sg_cleanup(struct drm_device *dev) { if (drm_core_check_feature(dev, DRIVER_SG) && dev->sg && - drm_core_check_feature(dev, DRIVER_LEGACY)) { + drm_core_check_feature(dev, DRIVER_DRI1)) { drm_sg_cleanup(dev->sg); dev->sg = NULL; } @@ -84,7 +84,7 @@ int drm_legacy_sg_alloc(struct drm_device *dev, void *data, DRM_DEBUG("\n"); - if (!drm_core_check_feature(dev, DRIVER_LEGACY)) + if (!drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; if (!drm_core_check_feature(dev, DRIVER_SG)) @@ -200,7 +200,7 @@ int drm_legacy_sg_free(struct drm_device *dev, void *data, struct drm_scatter_gather *request = data; struct drm_sg_mem *entry; - if (!drm_core_check_feature(dev, DRIVER_LEGACY)) + if (!drm_core_check_feature(dev, DRIVER_DRI1)) return -EOPNOTSUPP; if (!drm_core_check_feature(dev, DRIVER_SG)) diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c index 2ff31717a3de..a03b03edc6d4 100644 --- a/drivers/gpu/drm/drm_vblank.c +++ b/drivers/gpu/drm/drm_vblank.c @@ -1594,7 +1594,7 @@ int drm_legacy_modeset_ctl_ioctl(struct drm_device *dev, void *data, return 0; /* KMS drivers handle this internally */ - if (!drm_core_check_feature(dev, DRIVER_LEGACY)) + if (!drm_core_check_feature(dev, DRIVER_DRI1)) return 0; pipe = modeset->crtc; @@ -1740,7 +1740,7 @@ static void drm_wait_vblank_reply(struct drm_device *dev, unsigned int pipe, static bool drm_wait_vblank_supported(struct drm_device *dev) { #if IS_ENABLED(CONFIG_DRM_LEGACY) - if (unlikely(drm_core_check_feature(dev, DRIVER_LEGACY))) + if (unlikely(drm_core_check_feature(dev, DRIVER_DRI1))) return dev->irq_enabled; #endif return drm_dev_has_vblank(dev); diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c index 0e53a066d4db..fceb9a38c0ee 100644 --- a/drivers/gpu/drm/i810/i810_drv.c +++ b/drivers/gpu/drm/i810/i810_drv.c @@ -57,7 +57,7 @@ static const struct file_operations i810_driver_fops = { }; static struct drm_driver driver = { - .driver_features = DRIVER_USE_AGP | DRIVER_HAVE_DMA | DRIVER_LEGACY, + .driver_features = DRIVER_USE_AGP | DRIVER_HAVE_DMA | DRIVER_DRI1, .dev_priv_size = sizeof(drm_i810_buf_priv_t), .load = i810_driver_load, .lastclose = i810_driver_lastclose, diff --git a/drivers/gpu/drm/mga/mga_drv.c b/drivers/gpu/drm/mga/mga_drv.c index 71128e6f6ae9..0fc3f3a2d9d7 100644 --- a/drivers/gpu/drm/mga/mga_drv.c +++ b/drivers/gpu/drm/mga/mga_drv.c @@ -55,7 +55,7 @@ static const struct file_operations mga_driver_fops = { static struct drm_driver driver = { .driver_features = - DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_LEGACY | + DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_DRI1 | DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ, .dev_priv_size = sizeof(drm_mga_buf_priv_t), .load = mga_driver_load, diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c index e35a3a1449bd..6f90627be21b 100644 --- a/drivers/gpu/drm/r128/r128_drv.c +++ b/drivers/gpu/drm/r128/r128_drv.c @@ -59,7 +59,7 @@ static const struct file_operations r128_driver_fops = { static struct drm_driver driver = { .driver_features = - DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG | DRIVER_LEGACY | + DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG | DRIVER_DRI1 | DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ, .dev_priv_size = sizeof(drm_r128_buf_priv_t), .load = r128_driver_load, diff --git a/drivers/gpu/drm/savage/savage_drv.c b/drivers/gpu/drm/savage/savage_drv.c index 799bd11adb9c..66494500d7fd 100644 --- a/drivers/gpu/drm/savage/savage_drv.c +++ b/drivers/gpu/drm/savage/savage_drv.c @@ -49,7 +49,7 @@ static const struct file_operations savage_driver_fops = { static struct drm_driver driver = { .driver_features = - DRIVER_USE_AGP | DRIVER_HAVE_DMA | DRIVER_PCI_DMA | DRIVER_LEGACY, + DRIVER_USE_AGP | DRIVER_HAVE_DMA | DRIVER_PCI_DMA | DRIVER_DRI1, .dev_priv_size = sizeof(drm_savage_buf_priv_t), .load = savage_driver_load, .firstopen = savage_driver_firstopen, diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c index e35e719cf315..9206ded39462 100644 --- a/drivers/gpu/drm/sis/sis_drv.c +++ b/drivers/gpu/drm/sis/sis_drv.c @@ -101,7 +101,7 @@ static void sis_driver_postclose(struct drm_device *dev, struct drm_file *file) } static struct drm_driver driver = { - .driver_features = DRIVER_USE_AGP | DRIVER_LEGACY, + .driver_features = DRIVER_USE_AGP | DRIVER_DRI1, .load = sis_driver_load, .unload = sis_driver_unload, .open = sis_driver_open, diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.c b/drivers/gpu/drm/tdfx/tdfx_drv.c index 58c185c299f4..ec1326973b6c 100644 --- a/drivers/gpu/drm/tdfx/tdfx_drv.c +++ b/drivers/gpu/drm/tdfx/tdfx_drv.c @@ -57,7 +57,7 @@ static const struct file_operations tdfx_driver_fops = { }; static const struct drm_driver driver = { - .driver_features = DRIVER_LEGACY, + .driver_features = DRIVER_DRI1, .fops = &tdfx_driver_fops, .name = DRIVER_NAME, .desc = DRIVER_DESC, diff --git a/drivers/gpu/drm/via/via_dri1.c b/drivers/gpu/drm/via/via_dri1.c index d695d9291ece..c5708a3f4530 100644 --- a/drivers/gpu/drm/via/via_dri1.c +++ b/drivers/gpu/drm/via/via_dri1.c @@ -3579,7 +3579,7 @@ static const struct file_operations via_driver_fops = { static struct drm_driver driver = { .driver_features = - DRIVER_USE_AGP | DRIVER_HAVE_IRQ | DRIVER_LEGACY, + DRIVER_USE_AGP | DRIVER_HAVE_IRQ | DRIVER_DRI1, .load = via_driver_load, .unload = via_driver_unload, .open = via_driver_open, diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h index 9923c7a6885e..bbf7ff8aa492 100644 --- a/include/drm/drm_device.h +++ b/include/drm/drm_device.h @@ -138,7 +138,7 @@ struct drm_device { * Lock for others (not &drm_minor.master and &drm_file.is_master) * * WARNING: - * Only drivers annotated with DRIVER_LEGACY should be using this. + * Only drivers annotated with DRIVER_DRI1 should be using this. */ struct mutex struct_mutex; diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index f6159acb8856..e9725295686b 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -105,11 +105,11 @@ enum drm_driver_feature { */ DRIVER_USE_AGP = BIT(25), /** - * @DRIVER_LEGACY: + * @DRIVER_DRI1: * - * Denote a legacy driver using shadow attach. Do not use. + * Denote a DRI1 driver using shadow attach. Do not use. */ - DRIVER_LEGACY = BIT(26), + DRIVER_DRI1 = BIT(26), /** * @DRIVER_PCI_DMA: * From patchwork Sat Jul 16 18:17:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 12920220 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 1DD57C433EF for ; Sat, 16 Jul 2022 18:18:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B154F113D77; Sat, 16 Jul 2022 18:18:15 +0000 (UTC) Received: from mailrelay2-1.pub.mailoutpod1-cph3.one.com (mailrelay2-1.pub.mailoutpod1-cph3.one.com [46.30.210.183]) by gabe.freedesktop.org (Postfix) with ESMTPS id BB3A0113D77 for ; Sat, 16 Jul 2022 18:18:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravnborg.org; s=rsa1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=fRv5IazbEX1G4rl/pdT9Is/ggOr0HHq+PBI6C89pU6Q=; b=DwTf1UUCu06OSuI5F49ipt/z9cJe2jJDDs2c4hfbbrjVEb1+6XGFIiqgJC7+a/aPTZVMi6ogbeYV/ YpUs1ARxYG0MI/nKHZAZ5op5buv4J1R6WfxL+MQANwfJbJ9n+HRDr5sNDSjepCKFaUDxlT2NzO59yH YQ22DPU7cnL4cSLAF7ffJwOepvAgDkNRhAotjnc6168voLu++qLKLa8C8I2kPHrcdQaBnLVcxHnYfq J51PHBXBi1SLjeroCQ2plR/BDcod42WFP/9cA9EGbW3b0ET2O9nzEgKVOMM3ywrl9jmAeu8hoDS+g1 ul9YpfsEFqMtgIb/8NsSqLblVhx6Ygw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ravnborg.org; s=ed1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=fRv5IazbEX1G4rl/pdT9Is/ggOr0HHq+PBI6C89pU6Q=; b=15H9qKLqV6SzOwxFfK+bZSRwePfhnGiMMSAmXF8KRzu1Ez6OdvtEOunLYS3Mgerm6ciUaRLGWMAny DkKkZmcCQ== X-HalOne-Cookie: e37afb58957b93e896159eb72d450001c8765f30 X-HalOne-ID: a4df0be8-0533-11ed-a917-d0431ea8a290 Received: from mailproxy1.cst.dirpod3-cph3.one.com (2-105-2-98-cable.dk.customer.tdc.net [2.105.2.98]) by mailrelay2.pub.mailoutpod1-cph3.one.com (Halon) with ESMTPSA id a4df0be8-0533-11ed-a917-d0431ea8a290; Sat, 16 Jul 2022 18:18:08 +0000 (UTC) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v1 02/11] drm: Rename CONFIG_DRM_LEGACY to CONFIG_DRM_DRI1 Date: Sat, 16 Jul 2022 20:17:41 +0200 Message-Id: <20220716181750.3874838-3-sam@ravnborg.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220716181750.3874838-1-sam@ravnborg.org> References: <20220716181750.3874838-1-sam@ravnborg.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Javier Martinez Canillas , Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The rename is done to make it more obvious what is DRI1 drivers and what is other type of legacy. Signed-off-by: Sam Ravnborg Reviewed-by: Javier Martinez Canillas --- arch/powerpc/configs/pmac32_defconfig | 2 +- arch/powerpc/configs/ppc6xx_defconfig | 2 +- drivers/char/agp/Makefile | 2 +- drivers/char/agp/agp.h | 2 +- drivers/gpu/drm/Kconfig | 10 ++++----- drivers/gpu/drm/Makefile | 6 ++--- drivers/gpu/drm/drm_file.c | 4 ++-- drivers/gpu/drm/drm_internal.h | 2 +- drivers/gpu/drm/drm_ioc32.c | 12 +++++----- drivers/gpu/drm/drm_ioctl.c | 2 +- drivers/gpu/drm/drm_legacy.h | 32 +++++++++++++-------------- drivers/gpu/drm/drm_pci.c | 4 ++-- drivers/gpu/drm/drm_vblank.c | 8 +++---- drivers/gpu/drm/drm_vm.c | 2 +- include/drm/drm_auth.h | 2 +- include/drm/drm_device.h | 2 +- include/drm/drm_drv.h | 4 ++-- include/drm/drm_file.h | 2 +- include/drm/drm_legacy.h | 2 +- 19 files changed, 51 insertions(+), 51 deletions(-) diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig index 13885ec563d1..47bb0e8018e4 100644 --- a/arch/powerpc/configs/pmac32_defconfig +++ b/arch/powerpc/configs/pmac32_defconfig @@ -187,7 +187,7 @@ CONFIG_AGP=m CONFIG_AGP_UNINORTH=m CONFIG_DRM=m CONFIG_DRM_RADEON=m -CONFIG_DRM_LEGACY=y +CONFIG_DRM_DRI1=y CONFIG_DRM_R128=m CONFIG_FB=y CONFIG_FB_OF=y diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig index b622ecd73286..5616b669e6ab 100644 --- a/arch/powerpc/configs/ppc6xx_defconfig +++ b/arch/powerpc/configs/ppc6xx_defconfig @@ -694,7 +694,7 @@ CONFIG_AGP=y CONFIG_AGP_UNINORTH=y CONFIG_DRM=m CONFIG_DRM_RADEON=m -CONFIG_DRM_LEGACY=y +CONFIG_DRM_DRI1=y CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_MGA=m diff --git a/drivers/char/agp/Makefile b/drivers/char/agp/Makefile index 90ed8c789e48..360e8e9dde98 100644 --- a/drivers/char/agp/Makefile +++ b/drivers/char/agp/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 agpgart-y := backend.o generic.o isoch.o -ifeq ($(CONFIG_DRM_LEGACY),y) +ifeq ($(CONFIG_DRM_DRI1),y) agpgart-$(CONFIG_COMPAT) += compat_ioctl.o agpgart-y += frontend.o endif diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h index bb09d64cd51e..97802b076d80 100644 --- a/drivers/char/agp/agp.h +++ b/drivers/char/agp/agp.h @@ -186,7 +186,7 @@ int agp_add_bridge(struct agp_bridge_data *bridge); void agp_remove_bridge(struct agp_bridge_data *bridge); /* Frontend routines. */ -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) int agp_frontend_initialize(void); void agp_frontend_cleanup(void); #else diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 1c91e1e861a5..024081480fcf 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -402,10 +402,10 @@ config DRM_HYPERV If M is selected the module will be called hyperv_drm. -# Keep legacy drivers last +# Keep legacy DRI1 drivers last -menuconfig DRM_LEGACY - bool "Enable legacy drivers (DANGEROUS)" +menuconfig DRM_DRI1 + bool "Enable legacy DRI1 drivers (DANGEROUS)" depends on DRM && MMU help Enable legacy DRI1 drivers. Those drivers expose unsafe and dangerous @@ -419,7 +419,7 @@ menuconfig DRM_LEGACY Unless you have strong reasons to go rogue, say "N". -if DRM_LEGACY +if DRM_DRI1 config DRM_TDFX tristate "3dfx Banshee/Voodoo3+" @@ -478,7 +478,7 @@ config DRM_SAVAGE Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister chipset. If M is selected the module will be called savage. -endif # DRM_LEGACY +endif # DRM_DRI1 config DRM_EXPORT_FOR_TESTS bool diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 25016dcab55e..dd7f296ef9b8 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -18,9 +18,9 @@ drm-y := drm_aperture.o drm_auth.o drm_cache.o \ drm_syncobj.o drm_lease.o drm_writeback.o drm_client.o \ drm_client_modeset.o drm_atomic_uapi.o \ drm_managed.o drm_vblank_work.o -drm-$(CONFIG_DRM_LEGACY) += drm_agpsupport.o drm_bufs.o drm_context.o drm_dma.o \ - drm_hashtab.o drm_irq.o drm_legacy_misc.o drm_lock.o \ - drm_memory.o drm_scatter.o drm_vm.o +drm-$(CONFIG_DRM_DRI1) += drm_agpsupport.o drm_bufs.o drm_context.o drm_dma.o \ + drm_hashtab.o drm_irq.o drm_legacy_misc.o drm_lock.o \ + drm_memory.o drm_scatter.o drm_vm.o drm-$(CONFIG_DRM_LIB_RANDOM) += lib/drm_random.o drm-$(CONFIG_COMPAT) += drm_ioc32.o drm-$(CONFIG_DRM_PANEL) += drm_panel.o diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c index c6781afe41cf..a48bce8fe85e 100644 --- a/drivers/gpu/drm/drm_file.c +++ b/drivers/gpu/drm/drm_file.c @@ -255,7 +255,7 @@ void drm_file_free(struct drm_file *file) (long)old_encode_dev(file->minor->kdev->devt), atomic_read(&dev->open_count)); -#ifdef CONFIG_DRM_LEGACY +#ifdef CONFIG_DRM_DRI1 if (drm_core_check_feature(dev, DRIVER_DRI1) && dev->driver->preclose) dev->driver->preclose(dev, file); @@ -368,7 +368,7 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor) list_add(&priv->lhead, &dev->filelist); mutex_unlock(&dev->filelist_mutex); -#ifdef CONFIG_DRM_LEGACY +#ifdef CONFIG_DRM_DRI1 #ifdef __alpha__ /* * Default the hose diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index 1fbbc19f1ac0..fd085b9ea712 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -120,7 +120,7 @@ int drm_legacy_modeset_ctl_ioctl(struct drm_device *dev, void *data, /* drm_irq.c */ /* IOCTLS */ -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) int drm_legacy_irq_control(struct drm_device *dev, void *data, struct drm_file *file_priv); #endif diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c index 5d82891c3222..5d941f1eb231 100644 --- a/drivers/gpu/drm/drm_ioc32.c +++ b/drivers/gpu/drm/drm_ioc32.c @@ -163,7 +163,7 @@ static int compat_drm_setunique(struct file *file, unsigned int cmd, return -EINVAL; } -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) typedef struct drm_map32 { u32 offset; /* Requested physical address (0 for SAREA) */ u32 size; /* Requested physical size (bytes) */ @@ -308,7 +308,7 @@ static int compat_drm_getstats(struct file *file, unsigned int cmd, return 0; } -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) typedef struct drm_buf_desc32 { int count; /* Number of buffers of this size */ int size; /* Size in bytes */ @@ -618,7 +618,7 @@ static int compat_drm_dma(struct file *file, unsigned int cmd, } #endif -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) #if IS_ENABLED(CONFIG_AGP) typedef struct drm_agp_mode32 { u32 mode; /**< AGP mode */ @@ -914,13 +914,13 @@ static struct { #define DRM_IOCTL32_DEF(n, f) [DRM_IOCTL_NR(n##32)] = {.fn = f, .name = #n} DRM_IOCTL32_DEF(DRM_IOCTL_VERSION, compat_drm_version), DRM_IOCTL32_DEF(DRM_IOCTL_GET_UNIQUE, compat_drm_getunique), -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) DRM_IOCTL32_DEF(DRM_IOCTL_GET_MAP, compat_drm_getmap), #endif DRM_IOCTL32_DEF(DRM_IOCTL_GET_CLIENT, compat_drm_getclient), DRM_IOCTL32_DEF(DRM_IOCTL_GET_STATS, compat_drm_getstats), DRM_IOCTL32_DEF(DRM_IOCTL_SET_UNIQUE, compat_drm_setunique), -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) DRM_IOCTL32_DEF(DRM_IOCTL_ADD_MAP, compat_drm_addmap), DRM_IOCTL32_DEF(DRM_IOCTL_ADD_BUFS, compat_drm_addbufs), DRM_IOCTL32_DEF(DRM_IOCTL_MARK_BUFS, compat_drm_markbufs), @@ -941,7 +941,7 @@ static struct { DRM_IOCTL32_DEF(DRM_IOCTL_AGP_UNBIND, compat_drm_agp_unbind), #endif #endif -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) DRM_IOCTL32_DEF(DRM_IOCTL_SG_ALLOC, compat_drm_sg_alloc), DRM_IOCTL32_DEF(DRM_IOCTL_SG_FREE, compat_drm_sg_free), #endif diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index ab36c689f19f..5a075f2ed045 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -560,7 +560,7 @@ static int drm_ioctl_permit(u32 flags, struct drm_file *file_priv) .name = #ioctl \ } -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) #define DRM_LEGACY_IOCTL_DEF(ioctl, _func, _flags) DRM_IOCTL_DEF(ioctl, _func, _flags) #else #define DRM_LEGACY_IOCTL_DEF(ioctl, _func, _flags) DRM_IOCTL_DEF(ioctl, drm_invalid_op, _flags) diff --git a/drivers/gpu/drm/drm_legacy.h b/drivers/gpu/drm/drm_legacy.h index 70c9dba114a6..bae45f1d0e70 100644 --- a/drivers/gpu/drm/drm_legacy.h +++ b/drivers/gpu/drm/drm_legacy.h @@ -48,7 +48,7 @@ struct drm_open_hash; #define drm_hash_entry(_ptr, _type, _member) container_of(_ptr, _type, _member) /* drm_hashtab.c */ -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) int drm_ht_create(struct drm_open_hash *ht, unsigned int order); int drm_ht_insert_item(struct drm_open_hash *ht, struct drm_hash_item *item); int drm_ht_just_insert_please(struct drm_open_hash *ht, struct drm_hash_item *item, @@ -84,7 +84,7 @@ void drm_ht_remove(struct drm_open_hash *ht); #define DRM_KERNEL_CONTEXT 0 #define DRM_RESERVED_CONTEXTS 1 -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) void drm_legacy_ctxbitmap_init(struct drm_device *dev); void drm_legacy_ctxbitmap_cleanup(struct drm_device *dev); void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file); @@ -96,7 +96,7 @@ static inline void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm void drm_legacy_ctxbitmap_free(struct drm_device *dev, int ctx_handle); -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) int drm_legacy_resctx(struct drm_device *d, void *v, struct drm_file *f); int drm_legacy_addctx(struct drm_device *d, void *v, struct drm_file *f); int drm_legacy_getctx(struct drm_device *d, void *v, struct drm_file *f); @@ -114,7 +114,7 @@ int drm_legacy_getsareactx(struct drm_device *d, void *v, struct drm_file *f); #define DRM_MAP_HASH_OFFSET 0x10000000 -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) static inline int drm_legacy_create_map_hash(struct drm_device *dev) { return drm_ht_create(&dev->map_hash, 12); @@ -134,7 +134,7 @@ static inline void drm_legacy_remove_map_hash(struct drm_device *dev) {} #endif -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) int drm_legacy_getmap_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); int drm_legacy_addmap_ioctl(struct drm_device *d, void *v, struct drm_file *f); @@ -155,7 +155,7 @@ int __drm_legacy_mapbufs(struct drm_device *, void *, int *, int (*)(void *, int, unsigned long, struct drm_buf *), struct drm_file *); -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) void drm_legacy_master_rmmaps(struct drm_device *dev, struct drm_master *master); void drm_legacy_rmmaps(struct drm_device *dev); @@ -165,7 +165,7 @@ static inline void drm_legacy_master_rmmaps(struct drm_device *dev, static inline void drm_legacy_rmmaps(struct drm_device *dev) {} #endif -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) void drm_legacy_vma_flush(struct drm_device *d); #else static inline void drm_legacy_vma_flush(struct drm_device *d) @@ -187,7 +187,7 @@ struct drm_agp_mem { }; /* drm_agpsupport.c */ -#if IS_ENABLED(CONFIG_DRM_LEGACY) && IS_ENABLED(CONFIG_AGP) +#if IS_ENABLED(CONFIG_DRM_DRI1) && IS_ENABLED(CONFIG_AGP) void drm_legacy_agp_clear(struct drm_device *dev); int drm_legacy_agp_acquire_ioctl(struct drm_device *dev, void *data, @@ -211,7 +211,7 @@ static inline void drm_legacy_agp_clear(struct drm_device *dev) {} #endif /* drm_lock.c */ -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) int drm_legacy_lock(struct drm_device *d, void *v, struct drm_file *f); int drm_legacy_unlock(struct drm_device *d, void *v, struct drm_file *f); void drm_legacy_lock_release(struct drm_device *dev, struct file *filp); @@ -220,7 +220,7 @@ static inline void drm_legacy_lock_release(struct drm_device *dev, struct file * #endif /* DMA support */ -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) int drm_legacy_dma_setup(struct drm_device *dev); void drm_legacy_dma_takedown(struct drm_device *dev); #else @@ -232,7 +232,7 @@ static inline int drm_legacy_dma_setup(struct drm_device *dev) void drm_legacy_free_buffer(struct drm_device *dev, struct drm_buf * buf); -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) void drm_legacy_reclaim_buffers(struct drm_device *dev, struct drm_file *filp); #else @@ -241,7 +241,7 @@ static inline void drm_legacy_reclaim_buffers(struct drm_device *dev, #endif /* Scatter Gather Support */ -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) void drm_legacy_sg_cleanup(struct drm_device *dev); int drm_legacy_sg_alloc(struct drm_device *dev, void *data, struct drm_file *file_priv); @@ -249,7 +249,7 @@ int drm_legacy_sg_free(struct drm_device *dev, void *data, struct drm_file *file_priv); #endif -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) void drm_legacy_init_members(struct drm_device *dev); void drm_legacy_destroy_members(struct drm_device *dev); void drm_legacy_dev_reinit(struct drm_device *dev); @@ -261,20 +261,20 @@ static inline void drm_legacy_dev_reinit(struct drm_device *dev) {} static inline int drm_legacy_setup(struct drm_device * dev) { return 0; } #endif -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) void drm_legacy_lock_master_cleanup(struct drm_device *dev, struct drm_master *master); #else static inline void drm_legacy_lock_master_cleanup(struct drm_device *dev, struct drm_master *master) {} #endif -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) void drm_master_legacy_init(struct drm_master *master); #else static inline void drm_master_legacy_init(struct drm_master *master) {} #endif /* drm_pci.c */ -#if IS_ENABLED(CONFIG_DRM_LEGACY) && IS_ENABLED(CONFIG_PCI) +#if IS_ENABLED(CONFIG_DRM_DRI1) && IS_ENABLED(CONFIG_PCI) int drm_legacy_irq_by_busid(struct drm_device *dev, void *data, struct drm_file *file_priv); void drm_legacy_pci_agp_destroy(struct drm_device *dev); #else diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index eb0656db08a2..f92c2a484ee5 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c @@ -36,7 +36,7 @@ #include "drm_internal.h" #include "drm_legacy.h" -#ifdef CONFIG_DRM_LEGACY +#ifdef CONFIG_DRM_DRI1 /* List of devices hanging off drivers with stealth attach. */ static LIST_HEAD(legacy_dev_list); static DEFINE_MUTEX(legacy_dev_list_lock); @@ -72,7 +72,7 @@ int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master) return 0; } -#ifdef CONFIG_DRM_LEGACY +#ifdef CONFIG_DRM_DRI1 static int drm_legacy_pci_irq_by_busid(struct drm_device *dev, struct drm_irq_busid *p) { diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c index a03b03edc6d4..c33786d30afb 100644 --- a/drivers/gpu/drm/drm_vblank.c +++ b/drivers/gpu/drm/drm_vblank.c @@ -210,7 +210,7 @@ static u32 __get_vblank_counter(struct drm_device *dev, unsigned int pipe) if (crtc->funcs->get_vblank_counter) return crtc->funcs->get_vblank_counter(crtc); } -#ifdef CONFIG_DRM_LEGACY +#ifdef CONFIG_DRM_DRI1 else if (dev->driver->get_vblank_counter) { return dev->driver->get_vblank_counter(dev, pipe); } @@ -433,7 +433,7 @@ static void __disable_vblank(struct drm_device *dev, unsigned int pipe) if (crtc->funcs->disable_vblank) crtc->funcs->disable_vblank(crtc); } -#ifdef CONFIG_DRM_LEGACY +#ifdef CONFIG_DRM_DRI1 else { dev->driver->disable_vblank(dev, pipe); } @@ -1110,7 +1110,7 @@ static int __enable_vblank(struct drm_device *dev, unsigned int pipe) if (crtc->funcs->enable_vblank) return crtc->funcs->enable_vblank(crtc); } -#ifdef CONFIG_DRM_LEGACY +#ifdef CONFIG_DRM_DRI1 else if (dev->driver->enable_vblank) { return dev->driver->enable_vblank(dev, pipe); } @@ -1739,7 +1739,7 @@ static void drm_wait_vblank_reply(struct drm_device *dev, unsigned int pipe, static bool drm_wait_vblank_supported(struct drm_device *dev) { -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) if (unlikely(drm_core_check_feature(dev, DRIVER_DRI1))) return dev->irq_enabled; #endif diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index f024dc93939e..1cb5ee131e7c 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c @@ -651,7 +651,7 @@ int drm_legacy_mmap(struct file *filp, struct vm_area_struct *vma) } EXPORT_SYMBOL(drm_legacy_mmap); -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) void drm_legacy_vma_flush(struct drm_device *dev) { struct drm_vma_entry *vma, *vma_temp; diff --git a/include/drm/drm_auth.h b/include/drm/drm_auth.h index ba248ca8866f..e126df0da509 100644 --- a/include/drm/drm_auth.h +++ b/include/drm/drm_auth.h @@ -146,7 +146,7 @@ struct drm_master { */ struct idr lessee_idr; /* private: */ -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) struct drm_lock_data lock; #endif }; diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h index bbf7ff8aa492..5ff04e6599b7 100644 --- a/include/drm/drm_device.h +++ b/include/drm/drm_device.h @@ -297,7 +297,7 @@ struct drm_device { /* Everything below here is for legacy driver, never use! */ /* private: */ -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) /* List of devices per driver for stealth attach cleanup */ struct list_head legacy_dev_list; diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index e9725295686b..45cf84b53103 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -459,8 +459,8 @@ struct drm_driver { */ const struct file_operations *fops; -#ifdef CONFIG_DRM_LEGACY - /* Everything below here is for legacy driver, never use! */ +#ifdef CONFIG_DRM_DRI1 + /* Everything below here is for DRI1 drivers, never use! */ /* private: */ int (*firstopen) (struct drm_device *); diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h index e0a73a1e2df7..5040b0a7d1c4 100644 --- a/include/drm/drm_file.h +++ b/include/drm/drm_file.h @@ -363,7 +363,7 @@ struct drm_file { struct drm_prime_file_private prime; /* private: */ -#if IS_ENABLED(CONFIG_DRM_LEGACY) +#if IS_ENABLED(CONFIG_DRM_DRI1) unsigned long lock_count; /* DRI1 legacy lock count */ #endif }; diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h index 0fc85418aad8..f84a400b884d 100644 --- a/include/drm/drm_legacy.h +++ b/include/drm/drm_legacy.h @@ -260,7 +260,7 @@ struct drm_agp_head { unsigned long page_mask; }; -#if IS_ENABLED(CONFIG_DRM_LEGACY) && IS_ENABLED(CONFIG_AGP) +#if IS_ENABLED(CONFIG_DRM_DRI1) && IS_ENABLED(CONFIG_AGP) struct drm_agp_head *drm_legacy_agp_init(struct drm_device *dev); int drm_legacy_agp_acquire(struct drm_device *dev); int drm_legacy_agp_release(struct drm_device *dev); From patchwork Sat Jul 16 18:17:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 12920223 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 D5755C43334 for ; Sat, 16 Jul 2022 18:18:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 78515113E13; Sat, 16 Jul 2022 18:18:29 +0000 (UTC) Received: from mailrelay2-1.pub.mailoutpod1-cph3.one.com (mailrelay2-1.pub.mailoutpod1-cph3.one.com [46.30.210.183]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2E7041137EF for ; Sat, 16 Jul 2022 18:18:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravnborg.org; s=rsa1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=ALw7Zr+63bSFTJU6e0zttKiOAORGVGGBPrHCT91HdoQ=; b=I9GQcKCvd0U+XF4CMSQMxEy6+8KLq9iH0sP6pbQj4IGeh8OxLb2va6s4CoZ4jLnjETH7wVTmwzSDx 4CIOoklEKB0SZZ/CoyxUmbRgCu3Sp5zoE3lMj2n2LUUQ2pIgvNKXx5FjUWtvqq9xZygE2/HC1i0eAu O/9bEi+xxG2kDRf+eDuJdzxC6n3fxJBBua2+2znDfCjQ5iQuib3WEC0L6rzGMZRE2lXaYt66CT/hhc ZpiZMtMvc80LMcalVQdl0nUDXGC4RXiYrBXAt9YGnMIDCvoSluYJ8jlSAJmdQNQZFo9mXTwAOYcuXD LOEwkwxBe6g+VczD7QwMjRHJJvsWtiQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ravnborg.org; s=ed1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=ALw7Zr+63bSFTJU6e0zttKiOAORGVGGBPrHCT91HdoQ=; b=qvxrmOpDhkBOI1E9UsfZWJFTaiYjDQVZRpP19lFOAeCylQKbhvBEC51Kvm32lhCSUTA9eCGdRvk6V 4M01CMaBw== X-HalOne-Cookie: f61b55bf35c4a516d7cc57a6110fcefe56f9c213 X-HalOne-ID: a5c7c8e8-0533-11ed-a917-d0431ea8a290 Received: from mailproxy1.cst.dirpod3-cph3.one.com (2-105-2-98-cable.dk.customer.tdc.net [2.105.2.98]) by mailrelay2.pub.mailoutpod1-cph3.one.com (Halon) with ESMTPSA id a5c7c8e8-0533-11ed-a917-d0431ea8a290; Sat, 16 Jul 2022 18:18:10 +0000 (UTC) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v1 03/11] drm/tdfx: Move the tdfx driver to drm/dri1/ Date: Sat, 16 Jul 2022 20:17:42 +0200 Message-Id: <20220716181750.3874838-4-sam@ravnborg.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220716181750.3874838-1-sam@ravnborg.org> References: <20220716181750.3874838-1-sam@ravnborg.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Javier Martinez Canillas , Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" drm/dri1 is the new home for all the legacy DRI1 drivers. Signed-off-by: Sam Ravnborg Suggested-by: Javier Martinez Canillas Reviewed-by: Javier Martinez Canillas --- drivers/gpu/drm/Makefile | 2 +- drivers/gpu/drm/dri1/Makefile | 5 +++++ drivers/gpu/drm/{ => dri1}/tdfx/Makefile | 0 drivers/gpu/drm/{ => dri1}/tdfx/tdfx_drv.c | 0 drivers/gpu/drm/{ => dri1}/tdfx/tdfx_drv.h | 0 5 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/dri1/Makefile rename drivers/gpu/drm/{ => dri1}/tdfx/Makefile (100%) rename drivers/gpu/drm/{ => dri1}/tdfx/tdfx_drv.c (100%) rename drivers/gpu/drm/{ => dri1}/tdfx/tdfx_drv.h (100%) diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index dd7f296ef9b8..08a65237ce4e 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -83,7 +83,7 @@ obj-y += arm/ obj-y += display/ obj-$(CONFIG_DRM_TTM) += ttm/ obj-$(CONFIG_DRM_SCHED) += scheduler/ -obj-$(CONFIG_DRM_TDFX) += tdfx/ +obj-$(CONFIG_DRM_DRI1) += dri1/ obj-$(CONFIG_DRM_R128) += r128/ obj-$(CONFIG_DRM_RADEON)+= radeon/ obj-$(CONFIG_DRM_AMDGPU)+= amd/amdgpu/ diff --git a/drivers/gpu/drm/dri1/Makefile b/drivers/gpu/drm/dri1/Makefile new file mode 100644 index 000000000000..a3525b545670 --- /dev/null +++ b/drivers/gpu/drm/dri1/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for DRI1 drm device drivers + +obj-$(CONFIG_DRM_TDFX) += tdfx/ diff --git a/drivers/gpu/drm/tdfx/Makefile b/drivers/gpu/drm/dri1/tdfx/Makefile similarity index 100% rename from drivers/gpu/drm/tdfx/Makefile rename to drivers/gpu/drm/dri1/tdfx/Makefile diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.c b/drivers/gpu/drm/dri1/tdfx/tdfx_drv.c similarity index 100% rename from drivers/gpu/drm/tdfx/tdfx_drv.c rename to drivers/gpu/drm/dri1/tdfx/tdfx_drv.c diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.h b/drivers/gpu/drm/dri1/tdfx/tdfx_drv.h similarity index 100% rename from drivers/gpu/drm/tdfx/tdfx_drv.h rename to drivers/gpu/drm/dri1/tdfx/tdfx_drv.h From patchwork Sat Jul 16 18:17:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 12920219 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 C0D96C433EF for ; Sat, 16 Jul 2022 18:18:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 56A601137EF; Sat, 16 Jul 2022 18:18:15 +0000 (UTC) Received: from mailrelay2-1.pub.mailoutpod1-cph3.one.com (mailrelay2-1.pub.mailoutpod1-cph3.one.com [46.30.210.183]) by gabe.freedesktop.org (Postfix) with ESMTPS id B366E10E710 for ; Sat, 16 Jul 2022 18:18:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravnborg.org; s=rsa1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=sr4QeAPTC5rOv2Gwu52vXoePzx1RjcJLoxawdkPFE20=; b=e3K1c1oKd4orgnUTdbFKYQYSyzKZu/FbqHo15VYp7ZOtE+Mvg86P3r2El+Ehkgg38F7Lz30I5bI+o UtzYDDdn8FECu2pI2Vyb/btVvvc6Nfd4oT69gT3ebumhVJVJuPru6HXruVKoJER2DWvRwqMFkZk2dM 2fzr+HOu2RLgO7Kw3ORpkPUJh5BNZItYkC4ut+0sCDSMjV7+M43NA4ER4Is4jVEVfaWAzDHWb/IkD1 tlRyOKY5NGaE2/O8z2HUx97jcJWjmoQK38u30xBw0IbIOI0IjYU37g7oiAPu16uX4jrje5rU5glfcE k7WBB8wbct0+ESAaS3T1YqduLT3qXXg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ravnborg.org; s=ed1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=sr4QeAPTC5rOv2Gwu52vXoePzx1RjcJLoxawdkPFE20=; b=q6AzY/oD0iJki9xRmZAWxva3oBjyGto8jEn6YslvTwXg0pIgxAAIP9MJlL/g83JEIWR/MWJYBwp9B S0nl3fDAw== X-HalOne-Cookie: db05ffed2a408ad3cb95e0f165514b1bf98ffb0b X-HalOne-ID: a607b8ae-0533-11ed-a917-d0431ea8a290 Received: from mailproxy1.cst.dirpod3-cph3.one.com (2-105-2-98-cable.dk.customer.tdc.net [2.105.2.98]) by mailrelay2.pub.mailoutpod1-cph3.one.com (Halon) with ESMTPSA id a607b8ae-0533-11ed-a917-d0431ea8a290; Sat, 16 Jul 2022 18:18:10 +0000 (UTC) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v1 04/11] drm/r128: Move the r128 driver to drm/dri1/ Date: Sat, 16 Jul 2022 20:17:43 +0200 Message-Id: <20220716181750.3874838-5-sam@ravnborg.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220716181750.3874838-1-sam@ravnborg.org> References: <20220716181750.3874838-1-sam@ravnborg.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Javier Martinez Canillas , Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" drm/dri1 is the new home for all the legacy DRI1 drivers. Signed-off-by: Sam Ravnborg Suggested-by: Javier Martinez Canillas Reviewed-by: Javier Martinez Canillas --- drivers/gpu/drm/Makefile | 1 - drivers/gpu/drm/dri1/Makefile | 1 + drivers/gpu/drm/{ => dri1}/r128/Makefile | 0 drivers/gpu/drm/{ => dri1}/r128/ati_pcigart.c | 0 drivers/gpu/drm/{ => dri1}/r128/ati_pcigart.h | 0 drivers/gpu/drm/{ => dri1}/r128/r128_cce.c | 0 drivers/gpu/drm/{ => dri1}/r128/r128_drv.c | 0 drivers/gpu/drm/{ => dri1}/r128/r128_drv.h | 0 drivers/gpu/drm/{ => dri1}/r128/r128_ioc32.c | 0 drivers/gpu/drm/{ => dri1}/r128/r128_irq.c | 0 drivers/gpu/drm/{ => dri1}/r128/r128_state.c | 0 11 files changed, 1 insertion(+), 1 deletion(-) rename drivers/gpu/drm/{ => dri1}/r128/Makefile (100%) rename drivers/gpu/drm/{ => dri1}/r128/ati_pcigart.c (100%) rename drivers/gpu/drm/{ => dri1}/r128/ati_pcigart.h (100%) rename drivers/gpu/drm/{ => dri1}/r128/r128_cce.c (100%) rename drivers/gpu/drm/{ => dri1}/r128/r128_drv.c (100%) rename drivers/gpu/drm/{ => dri1}/r128/r128_drv.h (100%) rename drivers/gpu/drm/{ => dri1}/r128/r128_ioc32.c (100%) rename drivers/gpu/drm/{ => dri1}/r128/r128_irq.c (100%) rename drivers/gpu/drm/{ => dri1}/r128/r128_state.c (100%) diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 08a65237ce4e..0b6b33e64261 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -84,7 +84,6 @@ obj-y += display/ obj-$(CONFIG_DRM_TTM) += ttm/ obj-$(CONFIG_DRM_SCHED) += scheduler/ obj-$(CONFIG_DRM_DRI1) += dri1/ -obj-$(CONFIG_DRM_R128) += r128/ obj-$(CONFIG_DRM_RADEON)+= radeon/ obj-$(CONFIG_DRM_AMDGPU)+= amd/amdgpu/ obj-$(CONFIG_DRM_MGA) += mga/ diff --git a/drivers/gpu/drm/dri1/Makefile b/drivers/gpu/drm/dri1/Makefile index a3525b545670..f243aac48bb9 100644 --- a/drivers/gpu/drm/dri1/Makefile +++ b/drivers/gpu/drm/dri1/Makefile @@ -2,4 +2,5 @@ # # Makefile for DRI1 drm device drivers +obj-$(CONFIG_DRM_R128) += r128/ obj-$(CONFIG_DRM_TDFX) += tdfx/ diff --git a/drivers/gpu/drm/r128/Makefile b/drivers/gpu/drm/dri1/r128/Makefile similarity index 100% rename from drivers/gpu/drm/r128/Makefile rename to drivers/gpu/drm/dri1/r128/Makefile diff --git a/drivers/gpu/drm/r128/ati_pcigart.c b/drivers/gpu/drm/dri1/r128/ati_pcigart.c similarity index 100% rename from drivers/gpu/drm/r128/ati_pcigart.c rename to drivers/gpu/drm/dri1/r128/ati_pcigart.c diff --git a/drivers/gpu/drm/r128/ati_pcigart.h b/drivers/gpu/drm/dri1/r128/ati_pcigart.h similarity index 100% rename from drivers/gpu/drm/r128/ati_pcigart.h rename to drivers/gpu/drm/dri1/r128/ati_pcigart.h diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/dri1/r128/r128_cce.c similarity index 100% rename from drivers/gpu/drm/r128/r128_cce.c rename to drivers/gpu/drm/dri1/r128/r128_cce.c diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/dri1/r128/r128_drv.c similarity index 100% rename from drivers/gpu/drm/r128/r128_drv.c rename to drivers/gpu/drm/dri1/r128/r128_drv.c diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/dri1/r128/r128_drv.h similarity index 100% rename from drivers/gpu/drm/r128/r128_drv.h rename to drivers/gpu/drm/dri1/r128/r128_drv.h diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/dri1/r128/r128_ioc32.c similarity index 100% rename from drivers/gpu/drm/r128/r128_ioc32.c rename to drivers/gpu/drm/dri1/r128/r128_ioc32.c diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/dri1/r128/r128_irq.c similarity index 100% rename from drivers/gpu/drm/r128/r128_irq.c rename to drivers/gpu/drm/dri1/r128/r128_irq.c diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/dri1/r128/r128_state.c similarity index 100% rename from drivers/gpu/drm/r128/r128_state.c rename to drivers/gpu/drm/dri1/r128/r128_state.c From patchwork Sat Jul 16 18:17:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 12920224 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 69EFBC433EF for ; Sat, 16 Jul 2022 18:18:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9777211AE20; Sat, 16 Jul 2022 18:18:29 +0000 (UTC) Received: from mailrelay2-1.pub.mailoutpod1-cph3.one.com (mailrelay2-1.pub.mailoutpod1-cph3.one.com [46.30.210.183]) by gabe.freedesktop.org (Postfix) with ESMTPS id 24ED51137EF for ; Sat, 16 Jul 2022 18:18:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravnborg.org; s=rsa1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=ygd7x4eR1ku5jqLzs9upfQL0KZyzFuaUVslgwwd5MAc=; b=lVr1QVdQp7wWViVxSa4Kk1VH8EJ80aXHR2Ga5oHzs0RMldGOPLpsD3aqqhQl4lX5twoYUk3P3GAoQ QKHdXmtr5m09kODOLADG094GFMoaGbiih67wy7lB4OHyQgQLQ8Z9Y4P9X3I2N+2bIXqmjMWHww1f6I d6PtWp2mGgNhUN7UaWwBwl2xtmqZatFmxr/toLeb5SSMApRF0gf3R9jGSbs3cZ0oyM3Q5XpK15oy1h sm3Rky4WdvTk/el1QIsQ+t249/GkhoMADru1xzVc/cEu8531x9135pm/BOfHZDjfP49lMiCW83eNZn f5bJenIFCV8J455Gk1nqcvyvYC5Tk8A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ravnborg.org; s=ed1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=ygd7x4eR1ku5jqLzs9upfQL0KZyzFuaUVslgwwd5MAc=; b=9c510AEsXHgkcwOgduSSmI+i8K7f2DkTLEaBG1Og3LVLWkn46jPMJIDzlSbgI2HzMVQxuwsOCLi0B e6CVkefBw== X-HalOne-Cookie: af2adccfd935b75d08b75aa9130fc2892fc83c7b X-HalOne-ID: a65b1f60-0533-11ed-a917-d0431ea8a290 Received: from mailproxy1.cst.dirpod3-cph3.one.com (2-105-2-98-cable.dk.customer.tdc.net [2.105.2.98]) by mailrelay2.pub.mailoutpod1-cph3.one.com (Halon) with ESMTPSA id a65b1f60-0533-11ed-a917-d0431ea8a290; Sat, 16 Jul 2022 18:18:11 +0000 (UTC) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v1 05/11] drm/i810: Move the i810 driver to drm/dri1/ Date: Sat, 16 Jul 2022 20:17:44 +0200 Message-Id: <20220716181750.3874838-6-sam@ravnborg.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220716181750.3874838-1-sam@ravnborg.org> References: <20220716181750.3874838-1-sam@ravnborg.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Javier Martinez Canillas , Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" drm/dri1 is the new home for all the legacy DRI1 drivers. Signed-off-by: Sam Ravnborg Suggested-by: Javier Martinez Canillas Reviewed-by: Javier Martinez Canillas --- drivers/gpu/drm/Makefile | 1 - drivers/gpu/drm/dri1/Makefile | 1 + drivers/gpu/drm/{ => dri1}/i810/Makefile | 0 drivers/gpu/drm/{ => dri1}/i810/i810_dma.c | 0 drivers/gpu/drm/{ => dri1}/i810/i810_drv.c | 0 drivers/gpu/drm/{ => dri1}/i810/i810_drv.h | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename drivers/gpu/drm/{ => dri1}/i810/Makefile (100%) rename drivers/gpu/drm/{ => dri1}/i810/i810_dma.c (100%) rename drivers/gpu/drm/{ => dri1}/i810/i810_drv.c (100%) rename drivers/gpu/drm/{ => dri1}/i810/i810_drv.h (100%) diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 0b6b33e64261..9a664a4a021d 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -87,7 +87,6 @@ obj-$(CONFIG_DRM_DRI1) += dri1/ obj-$(CONFIG_DRM_RADEON)+= radeon/ obj-$(CONFIG_DRM_AMDGPU)+= amd/amdgpu/ obj-$(CONFIG_DRM_MGA) += mga/ -obj-$(CONFIG_DRM_I810) += i810/ obj-$(CONFIG_DRM_I915) += i915/ obj-$(CONFIG_DRM_KMB_DISPLAY) += kmb/ obj-$(CONFIG_DRM_MGAG200) += mgag200/ diff --git a/drivers/gpu/drm/dri1/Makefile b/drivers/gpu/drm/dri1/Makefile index f243aac48bb9..d16bfdf26888 100644 --- a/drivers/gpu/drm/dri1/Makefile +++ b/drivers/gpu/drm/dri1/Makefile @@ -2,5 +2,6 @@ # # Makefile for DRI1 drm device drivers +obj-$(CONFIG_DRM_I810) += i810/ obj-$(CONFIG_DRM_R128) += r128/ obj-$(CONFIG_DRM_TDFX) += tdfx/ diff --git a/drivers/gpu/drm/i810/Makefile b/drivers/gpu/drm/dri1/i810/Makefile similarity index 100% rename from drivers/gpu/drm/i810/Makefile rename to drivers/gpu/drm/dri1/i810/Makefile diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/dri1/i810/i810_dma.c similarity index 100% rename from drivers/gpu/drm/i810/i810_dma.c rename to drivers/gpu/drm/dri1/i810/i810_dma.c diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/dri1/i810/i810_drv.c similarity index 100% rename from drivers/gpu/drm/i810/i810_drv.c rename to drivers/gpu/drm/dri1/i810/i810_drv.c diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/dri1/i810/i810_drv.h similarity index 100% rename from drivers/gpu/drm/i810/i810_drv.h rename to drivers/gpu/drm/dri1/i810/i810_drv.h From patchwork Sat Jul 16 18:17:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 12920228 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 13AACC43334 for ; Sat, 16 Jul 2022 18:18:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5434011BBD3; Sat, 16 Jul 2022 18:18:44 +0000 (UTC) Received: from mailrelay2-1.pub.mailoutpod1-cph3.one.com (mailrelay2-1.pub.mailoutpod1-cph3.one.com [46.30.210.183]) by gabe.freedesktop.org (Postfix) with ESMTPS id A135F1137EF for ; Sat, 16 Jul 2022 18:18:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravnborg.org; s=rsa1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=QNlqCDzBC/xc9ObXOnKybDxb7MBaSlE35AVrZ/ElDiE=; b=ken5ZUOtrSkH79Djlbgg04afbXhsQnL0GTW0w9L084+MSO0ppz4AG/nPUtnxzC/50lFY6QqcEx/6+ lfSa8B9xQnlqv3W5Zef5ZUIxA7Esock/xdzOMna6lELNV7S5qdgtAxNVi8RTnu/eGsM0+2z3aJNs4V RQx0nL734LnEUnE+oKTTIme6l0GIsLJbo+2k45I3fIdBXNClDRRddZf7kLHf1LOdsUQNB4pmJcKJAC 51B3Zc6FOmZtEAUhyNujIhSiXpOgfNzMMDRsZLmaPdxPFL5G7b1u/YPNFBiWzbWFmBSLpEfb1DK0BI v6CTTeaq+VHfX+jYz3YiWqa6hXhRilw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ravnborg.org; s=ed1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=QNlqCDzBC/xc9ObXOnKybDxb7MBaSlE35AVrZ/ElDiE=; b=XCG826ZmL26v/J5sQ73VtxT3DAkkPaOVVf1GnIrnsu7G2O3cFNsiCG7AqUwsIJNvttmw1LPA8T9fq HnUEfEQDA== X-HalOne-Cookie: a691bb4bf282d6cf169d4d6ef68570725fe6511c X-HalOne-ID: a69d0114-0533-11ed-a917-d0431ea8a290 Received: from mailproxy1.cst.dirpod3-cph3.one.com (2-105-2-98-cable.dk.customer.tdc.net [2.105.2.98]) by mailrelay2.pub.mailoutpod1-cph3.one.com (Halon) with ESMTPSA id a69d0114-0533-11ed-a917-d0431ea8a290; Sat, 16 Jul 2022 18:18:11 +0000 (UTC) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v1 06/11] drm/mga: Move the mga driver to drm/dri1/ Date: Sat, 16 Jul 2022 20:17:45 +0200 Message-Id: <20220716181750.3874838-7-sam@ravnborg.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220716181750.3874838-1-sam@ravnborg.org> References: <20220716181750.3874838-1-sam@ravnborg.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Javier Martinez Canillas , Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" drm/dri1 is the new home for all the legacy DRI1 drivers. Signed-off-by: Sam Ravnborg Suggested-by: Javier Martinez Canillas Reviewed-by: Javier Martinez Canillas Reviewed-by: Javier Martinez Canillas --- drivers/gpu/drm/Makefile | 1 - drivers/gpu/drm/dri1/Makefile | 1 + drivers/gpu/drm/{ => dri1}/mga/Makefile | 0 drivers/gpu/drm/{ => dri1}/mga/mga_dma.c | 0 drivers/gpu/drm/{ => dri1}/mga/mga_drv.c | 0 drivers/gpu/drm/{ => dri1}/mga/mga_drv.h | 0 drivers/gpu/drm/{ => dri1}/mga/mga_ioc32.c | 0 drivers/gpu/drm/{ => dri1}/mga/mga_irq.c | 0 drivers/gpu/drm/{ => dri1}/mga/mga_state.c | 0 drivers/gpu/drm/{ => dri1}/mga/mga_warp.c | 0 10 files changed, 1 insertion(+), 1 deletion(-) rename drivers/gpu/drm/{ => dri1}/mga/Makefile (100%) rename drivers/gpu/drm/{ => dri1}/mga/mga_dma.c (100%) rename drivers/gpu/drm/{ => dri1}/mga/mga_drv.c (100%) rename drivers/gpu/drm/{ => dri1}/mga/mga_drv.h (100%) rename drivers/gpu/drm/{ => dri1}/mga/mga_ioc32.c (100%) rename drivers/gpu/drm/{ => dri1}/mga/mga_irq.c (100%) rename drivers/gpu/drm/{ => dri1}/mga/mga_state.c (100%) rename drivers/gpu/drm/{ => dri1}/mga/mga_warp.c (100%) diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 9a664a4a021d..363cecfff919 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -86,7 +86,6 @@ obj-$(CONFIG_DRM_SCHED) += scheduler/ obj-$(CONFIG_DRM_DRI1) += dri1/ obj-$(CONFIG_DRM_RADEON)+= radeon/ obj-$(CONFIG_DRM_AMDGPU)+= amd/amdgpu/ -obj-$(CONFIG_DRM_MGA) += mga/ obj-$(CONFIG_DRM_I915) += i915/ obj-$(CONFIG_DRM_KMB_DISPLAY) += kmb/ obj-$(CONFIG_DRM_MGAG200) += mgag200/ diff --git a/drivers/gpu/drm/dri1/Makefile b/drivers/gpu/drm/dri1/Makefile index d16bfdf26888..c254e443aa3a 100644 --- a/drivers/gpu/drm/dri1/Makefile +++ b/drivers/gpu/drm/dri1/Makefile @@ -3,5 +3,6 @@ # Makefile for DRI1 drm device drivers obj-$(CONFIG_DRM_I810) += i810/ +obj-$(CONFIG_DRM_MGA) += mga/ obj-$(CONFIG_DRM_R128) += r128/ obj-$(CONFIG_DRM_TDFX) += tdfx/ diff --git a/drivers/gpu/drm/mga/Makefile b/drivers/gpu/drm/dri1/mga/Makefile similarity index 100% rename from drivers/gpu/drm/mga/Makefile rename to drivers/gpu/drm/dri1/mga/Makefile diff --git a/drivers/gpu/drm/mga/mga_dma.c b/drivers/gpu/drm/dri1/mga/mga_dma.c similarity index 100% rename from drivers/gpu/drm/mga/mga_dma.c rename to drivers/gpu/drm/dri1/mga/mga_dma.c diff --git a/drivers/gpu/drm/mga/mga_drv.c b/drivers/gpu/drm/dri1/mga/mga_drv.c similarity index 100% rename from drivers/gpu/drm/mga/mga_drv.c rename to drivers/gpu/drm/dri1/mga/mga_drv.c diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/dri1/mga/mga_drv.h similarity index 100% rename from drivers/gpu/drm/mga/mga_drv.h rename to drivers/gpu/drm/dri1/mga/mga_drv.h diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/dri1/mga/mga_ioc32.c similarity index 100% rename from drivers/gpu/drm/mga/mga_ioc32.c rename to drivers/gpu/drm/dri1/mga/mga_ioc32.c diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/dri1/mga/mga_irq.c similarity index 100% rename from drivers/gpu/drm/mga/mga_irq.c rename to drivers/gpu/drm/dri1/mga/mga_irq.c diff --git a/drivers/gpu/drm/mga/mga_state.c b/drivers/gpu/drm/dri1/mga/mga_state.c similarity index 100% rename from drivers/gpu/drm/mga/mga_state.c rename to drivers/gpu/drm/dri1/mga/mga_state.c diff --git a/drivers/gpu/drm/mga/mga_warp.c b/drivers/gpu/drm/dri1/mga/mga_warp.c similarity index 100% rename from drivers/gpu/drm/mga/mga_warp.c rename to drivers/gpu/drm/dri1/mga/mga_warp.c From patchwork Sat Jul 16 18:17:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 12920222 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 0FB65C433EF for ; Sat, 16 Jul 2022 18:18:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 554D211B2AE; Sat, 16 Jul 2022 18:18:16 +0000 (UTC) Received: from mailrelay2-1.pub.mailoutpod1-cph3.one.com (mailrelay2-1.pub.mailoutpod1-cph3.one.com [46.30.210.183]) by gabe.freedesktop.org (Postfix) with ESMTPS id 180D910E710 for ; Sat, 16 Jul 2022 18:18:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravnborg.org; s=rsa1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=IXtw3tafU4mScuN2nLd9yErjeYseeDy3/hqtfWpDzI4=; b=BPQPGMHZXDax8otqWDMJYhP1E/C5pJiVsIEZ5fmj/LtGjMuasGsYu06dAJzkiptpRknZpDBFw6+Jm bUkHkmpX3DCnLZXvCks0HygoZeGI9f7i13Xu7WQLi9hPzU4hhyLle5GWCU9i5t2yRUgbBuxmAujeve TPOreFSng1jyjywByr23iVKpyarduxO7CwgFaOAUG1+2BDaEoA57h43WDehAd/1qpyxX2fkV6fPysn /AMTFYiCGX9yOqmIo/Zw6UuEfUcok7RJqp8XnEHnyT6g4QJFIa1r3fmKMERSNvxIsbG8xMBou3/eC0 ThitmKjjuMuEdYa6cesjlmwWECP/D4Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ravnborg.org; s=ed1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=IXtw3tafU4mScuN2nLd9yErjeYseeDy3/hqtfWpDzI4=; b=P7ASg2yf2mDHxh1rEvKNYdlX1RPxKcrug+ViThzL2dT/XO+1UhRlhFpT5jaurg3NFz7bBLT4zSF0a S7Zk5swCg== X-HalOne-Cookie: af5d15f1f4993f6a506e049e346c18e41a640f06 X-HalOne-ID: a6ea2f2f-0533-11ed-a917-d0431ea8a290 Received: from mailproxy1.cst.dirpod3-cph3.one.com (2-105-2-98-cable.dk.customer.tdc.net [2.105.2.98]) by mailrelay2.pub.mailoutpod1-cph3.one.com (Halon) with ESMTPSA id a6ea2f2f-0533-11ed-a917-d0431ea8a290; Sat, 16 Jul 2022 18:18:12 +0000 (UTC) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v1 07/11] drm/sis: Move the sis driver to drm/dri1/ Date: Sat, 16 Jul 2022 20:17:46 +0200 Message-Id: <20220716181750.3874838-8-sam@ravnborg.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220716181750.3874838-1-sam@ravnborg.org> References: <20220716181750.3874838-1-sam@ravnborg.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Javier Martinez Canillas , Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" drm/dri1 is the new home for all the legacy DRI1 drivers. Signed-off-by: Sam Ravnborg Suggested-by: Javier Martinez Canillas Reviewed-by: Javier Martinez Canillas --- drivers/gpu/drm/Makefile | 1 - drivers/gpu/drm/dri1/Makefile | 1 + drivers/gpu/drm/{ => dri1}/sis/Makefile | 0 drivers/gpu/drm/{ => dri1}/sis/sis_drv.c | 0 drivers/gpu/drm/{ => dri1}/sis/sis_drv.h | 0 drivers/gpu/drm/{ => dri1}/sis/sis_mm.c | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename drivers/gpu/drm/{ => dri1}/sis/Makefile (100%) rename drivers/gpu/drm/{ => dri1}/sis/sis_drv.c (100%) rename drivers/gpu/drm/{ => dri1}/sis/sis_drv.h (100%) rename drivers/gpu/drm/{ => dri1}/sis/sis_mm.c (100%) diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 363cecfff919..7de784da6345 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -91,7 +91,6 @@ obj-$(CONFIG_DRM_KMB_DISPLAY) += kmb/ obj-$(CONFIG_DRM_MGAG200) += mgag200/ obj-$(CONFIG_DRM_V3D) += v3d/ obj-$(CONFIG_DRM_VC4) += vc4/ -obj-$(CONFIG_DRM_SIS) += sis/ obj-$(CONFIG_DRM_SAVAGE)+= savage/ obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/ obj-$(CONFIG_DRM_VIA) +=via/ diff --git a/drivers/gpu/drm/dri1/Makefile b/drivers/gpu/drm/dri1/Makefile index c254e443aa3a..23e33398fdf5 100644 --- a/drivers/gpu/drm/dri1/Makefile +++ b/drivers/gpu/drm/dri1/Makefile @@ -5,4 +5,5 @@ obj-$(CONFIG_DRM_I810) += i810/ obj-$(CONFIG_DRM_MGA) += mga/ obj-$(CONFIG_DRM_R128) += r128/ +obj-$(CONFIG_DRM_SIS) += sis/ obj-$(CONFIG_DRM_TDFX) += tdfx/ diff --git a/drivers/gpu/drm/sis/Makefile b/drivers/gpu/drm/dri1/sis/Makefile similarity index 100% rename from drivers/gpu/drm/sis/Makefile rename to drivers/gpu/drm/dri1/sis/Makefile diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/dri1/sis/sis_drv.c similarity index 100% rename from drivers/gpu/drm/sis/sis_drv.c rename to drivers/gpu/drm/dri1/sis/sis_drv.c diff --git a/drivers/gpu/drm/sis/sis_drv.h b/drivers/gpu/drm/dri1/sis/sis_drv.h similarity index 100% rename from drivers/gpu/drm/sis/sis_drv.h rename to drivers/gpu/drm/dri1/sis/sis_drv.h diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/dri1/sis/sis_mm.c similarity index 100% rename from drivers/gpu/drm/sis/sis_mm.c rename to drivers/gpu/drm/dri1/sis/sis_mm.c From patchwork Sat Jul 16 18:17:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 12920221 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 2A066C43334 for ; Sat, 16 Jul 2022 18:18:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ABB5910E710; Sat, 16 Jul 2022 18:18:15 +0000 (UTC) Received: from mailrelay2-1.pub.mailoutpod1-cph3.one.com (mailrelay2-1.pub.mailoutpod1-cph3.one.com [46.30.210.183]) by gabe.freedesktop.org (Postfix) with ESMTPS id 867AC1137EF for ; Sat, 16 Jul 2022 18:18:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravnborg.org; s=rsa1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=5NJM7fz2FGxexzXwoCO/wKqC9c3x7sQGSr/Z1Sccvtc=; b=FvAo3HAXx6Yxi3v0Y6tnEWc93EZsoEaPQItDkMvvFSYQToX3oSJYGA2HVMaK8zAGZqOxvWGbxcpwA tOMBLwJVlwl+510laPUdU2bDDoS/3P2CUyAkw7vmAeIsGLW8Ynb8t2mgRAY7+bTxAQ/bQQyZC9nAAa 93CMSwYjg7U38AyS6rLYy212Hfxj22CXh3OyiE4/mCZYf/LNpRJyRyk/JGJjTgmo7nMSCjaqIdnvCy u7V00V0An242+VyU0l+LQJ6CNWOQtuzn7A0Xu+JIhXbkptYJbsYCrsmQaBAS5ccXRgRKHAh/G4HfJi qQmN2w+y9W5Dlzd0zUcPLxUtHSs4y5Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ravnborg.org; s=ed1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=5NJM7fz2FGxexzXwoCO/wKqC9c3x7sQGSr/Z1Sccvtc=; b=U2RWaaurND4gp2AM5Z1KeOkUrsDdlnCbVuwW1aewFbQgWvCLkqH6eSGUKASW+HNUSSil5H+8ppLF+ JlFDf2KDg== X-HalOne-Cookie: e5398646f7218ce47fb20540379e7ed9b6f06203 X-HalOne-ID: a72d56e5-0533-11ed-a917-d0431ea8a290 Received: from mailproxy1.cst.dirpod3-cph3.one.com (2-105-2-98-cable.dk.customer.tdc.net [2.105.2.98]) by mailrelay2.pub.mailoutpod1-cph3.one.com (Halon) with ESMTPSA id a72d56e5-0533-11ed-a917-d0431ea8a290; Sat, 16 Jul 2022 18:18:12 +0000 (UTC) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v1 08/11] drm/via: Move the via driver to drm/dri1/ Date: Sat, 16 Jul 2022 20:17:47 +0200 Message-Id: <20220716181750.3874838-9-sam@ravnborg.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220716181750.3874838-1-sam@ravnborg.org> References: <20220716181750.3874838-1-sam@ravnborg.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Javier Martinez Canillas , Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" drm/dri1 is the new home for all the legacy DRI1 drivers. Used the opportunity to rename the file to via.c to match the name of the driver. Signed-off-by: Sam Ravnborg Suggested-by: Javier Martinez Canillas Reviewed-by: Javier Martinez Canillas --- drivers/gpu/drm/Makefile | 1 - drivers/gpu/drm/dri1/Makefile | 1 + drivers/gpu/drm/{ => dri1}/via/Makefile | 4 +--- drivers/gpu/drm/{via/via_dri1.c => dri1/via/via.c} | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) rename drivers/gpu/drm/{ => dri1}/via/Makefile (77%) rename drivers/gpu/drm/{via/via_dri1.c => dri1/via/via.c} (99%) diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 7de784da6345..bb3d8ffb9dd6 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -93,7 +93,6 @@ obj-$(CONFIG_DRM_V3D) += v3d/ obj-$(CONFIG_DRM_VC4) += vc4/ obj-$(CONFIG_DRM_SAVAGE)+= savage/ obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/ -obj-$(CONFIG_DRM_VIA) +=via/ obj-$(CONFIG_DRM_VGEM) += vgem/ obj-$(CONFIG_DRM_VKMS) += vkms/ obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/ diff --git a/drivers/gpu/drm/dri1/Makefile b/drivers/gpu/drm/dri1/Makefile index 23e33398fdf5..73c0aa1c7b94 100644 --- a/drivers/gpu/drm/dri1/Makefile +++ b/drivers/gpu/drm/dri1/Makefile @@ -7,3 +7,4 @@ obj-$(CONFIG_DRM_MGA) += mga/ obj-$(CONFIG_DRM_R128) += r128/ obj-$(CONFIG_DRM_SIS) += sis/ obj-$(CONFIG_DRM_TDFX) += tdfx/ +obj-$(CONFIG_DRM_VIA) += via/ diff --git a/drivers/gpu/drm/via/Makefile b/drivers/gpu/drm/dri1/via/Makefile similarity index 77% rename from drivers/gpu/drm/via/Makefile rename to drivers/gpu/drm/dri1/via/Makefile index 8b978dd51a25..b7cd59c2e226 100644 --- a/drivers/gpu/drm/via/Makefile +++ b/drivers/gpu/drm/dri1/via/Makefile @@ -3,6 +3,4 @@ # Makefile for the drm device driver. This driver provides support for the # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. -via-y := via_dri1.o - -obj-$(CONFIG_DRM_VIA) +=via.o +obj-$(CONFIG_DRM_VIA) += via.o diff --git a/drivers/gpu/drm/via/via_dri1.c b/drivers/gpu/drm/dri1/via/via.c similarity index 99% rename from drivers/gpu/drm/via/via_dri1.c rename to drivers/gpu/drm/dri1/via/via.c index c5708a3f4530..24bc3ebe66e1 100644 --- a/drivers/gpu/drm/via/via_dri1.c +++ b/drivers/gpu/drm/dri1/via/via.c @@ -44,7 +44,7 @@ #include #include -#include "via_3d_reg.h" +#include "../../via/via_3d_reg.h" #define DRIVER_AUTHOR "Various" From patchwork Sat Jul 16 18:17:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 12920225 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 2C978C43334 for ; Sat, 16 Jul 2022 18:18:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4875D11B722; Sat, 16 Jul 2022 18:18:30 +0000 (UTC) Received: from mailrelay2-1.pub.mailoutpod1-cph3.one.com (mailrelay2-1.pub.mailoutpod1-cph3.one.com [46.30.210.183]) by gabe.freedesktop.org (Postfix) with ESMTPS id 02CB910E710 for ; Sat, 16 Jul 2022 18:18:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravnborg.org; s=rsa1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=NNt1Kw96OrpHMORBjGtZQu5ATXnDc/FkkYhDy9P2fH4=; b=jjwlaJhWSqmUw4pjDWCXrwDW+V3SQmX6wwBVuTiqayTl0Joy5L1Z/1VxVb9ftJPKcFhHzO1kwILvq aoQVhV1PaVo8dIsSNP5wFgd2Ar50ltZSCCGkj1wSx4PPC5DYyPQq3W6pzKymDZ1njBlYSuDMZiMJbg XNSGBD/kQV0nRMjVEg/2faXAL/J9drWkGGbD+pqx1Nxm1ntR9CM4mf8YMRRUiREZbzh1KOdTvH/Efh 9aD5U/exCIer/fJZAhqTN/rEjFxm9z9nIWuslOTo2PojlpTiNqD8fxlt9UtpvKqXTl9+SCOGScveiK yXx4lhPjyVZ1LulmUdM95vkrXTEmPag== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ravnborg.org; s=ed1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=NNt1Kw96OrpHMORBjGtZQu5ATXnDc/FkkYhDy9P2fH4=; b=eO96aoDv1VZOmuvibB73eCJceizAmYu2kvTkJlBdoTJI7G8CMXgkIo5NgrmXa4vI/SCStYXISAz6v kXZYRJgBA== X-HalOne-Cookie: 6e889f98c26160eda7a71683b9db1b924c3bb7f8 X-HalOne-ID: a770038b-0533-11ed-a917-d0431ea8a290 Received: from mailproxy1.cst.dirpod3-cph3.one.com (2-105-2-98-cable.dk.customer.tdc.net [2.105.2.98]) by mailrelay2.pub.mailoutpod1-cph3.one.com (Halon) with ESMTPSA id a770038b-0533-11ed-a917-d0431ea8a290; Sat, 16 Jul 2022 18:18:12 +0000 (UTC) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v1 09/11] drm/savage: Move the savage driver to drm/dri1/ Date: Sat, 16 Jul 2022 20:17:48 +0200 Message-Id: <20220716181750.3874838-10-sam@ravnborg.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220716181750.3874838-1-sam@ravnborg.org> References: <20220716181750.3874838-1-sam@ravnborg.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Javier Martinez Canillas , Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" drm/dri1 is the new home for all the legacy DRI1 drivers. Signed-off-by: Sam Ravnborg Suggested-by: Javier Martinez Canillas Reviewed-by: Javier Martinez Canillas --- drivers/gpu/drm/Makefile | 1 - drivers/gpu/drm/dri1/Makefile | 1 + drivers/gpu/drm/{ => dri1}/savage/Makefile | 0 drivers/gpu/drm/{ => dri1}/savage/savage_bci.c | 0 drivers/gpu/drm/{ => dri1}/savage/savage_drv.c | 0 drivers/gpu/drm/{ => dri1}/savage/savage_drv.h | 0 drivers/gpu/drm/{ => dri1}/savage/savage_state.c | 0 7 files changed, 1 insertion(+), 1 deletion(-) rename drivers/gpu/drm/{ => dri1}/savage/Makefile (100%) rename drivers/gpu/drm/{ => dri1}/savage/savage_bci.c (100%) rename drivers/gpu/drm/{ => dri1}/savage/savage_drv.c (100%) rename drivers/gpu/drm/{ => dri1}/savage/savage_drv.h (100%) rename drivers/gpu/drm/{ => dri1}/savage/savage_state.c (100%) diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index bb3d8ffb9dd6..a3bd337bcab4 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -91,7 +91,6 @@ obj-$(CONFIG_DRM_KMB_DISPLAY) += kmb/ obj-$(CONFIG_DRM_MGAG200) += mgag200/ obj-$(CONFIG_DRM_V3D) += v3d/ obj-$(CONFIG_DRM_VC4) += vc4/ -obj-$(CONFIG_DRM_SAVAGE)+= savage/ obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/ obj-$(CONFIG_DRM_VGEM) += vgem/ obj-$(CONFIG_DRM_VKMS) += vkms/ diff --git a/drivers/gpu/drm/dri1/Makefile b/drivers/gpu/drm/dri1/Makefile index 73c0aa1c7b94..f639d5e0ae2e 100644 --- a/drivers/gpu/drm/dri1/Makefile +++ b/drivers/gpu/drm/dri1/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_DRM_I810) += i810/ obj-$(CONFIG_DRM_MGA) += mga/ obj-$(CONFIG_DRM_R128) += r128/ +obj-$(CONFIG_DRM_SAVAGE) += savage/ obj-$(CONFIG_DRM_SIS) += sis/ obj-$(CONFIG_DRM_TDFX) += tdfx/ obj-$(CONFIG_DRM_VIA) += via/ diff --git a/drivers/gpu/drm/savage/Makefile b/drivers/gpu/drm/dri1/savage/Makefile similarity index 100% rename from drivers/gpu/drm/savage/Makefile rename to drivers/gpu/drm/dri1/savage/Makefile diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/dri1/savage/savage_bci.c similarity index 100% rename from drivers/gpu/drm/savage/savage_bci.c rename to drivers/gpu/drm/dri1/savage/savage_bci.c diff --git a/drivers/gpu/drm/savage/savage_drv.c b/drivers/gpu/drm/dri1/savage/savage_drv.c similarity index 100% rename from drivers/gpu/drm/savage/savage_drv.c rename to drivers/gpu/drm/dri1/savage/savage_drv.c diff --git a/drivers/gpu/drm/savage/savage_drv.h b/drivers/gpu/drm/dri1/savage/savage_drv.h similarity index 100% rename from drivers/gpu/drm/savage/savage_drv.h rename to drivers/gpu/drm/dri1/savage/savage_drv.h diff --git a/drivers/gpu/drm/savage/savage_state.c b/drivers/gpu/drm/dri1/savage/savage_state.c similarity index 100% rename from drivers/gpu/drm/savage/savage_state.c rename to drivers/gpu/drm/dri1/savage/savage_state.c From patchwork Sat Jul 16 18:17:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 12920226 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 A5D51CCA479 for ; Sat, 16 Jul 2022 18:18:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4979111B864; Sat, 16 Jul 2022 18:18:30 +0000 (UTC) Received: from mailrelay2-1.pub.mailoutpod1-cph3.one.com (mailrelay2-1.pub.mailoutpod1-cph3.one.com [46.30.210.183]) by gabe.freedesktop.org (Postfix) with ESMTPS id F09C7113E13 for ; Sat, 16 Jul 2022 18:18:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravnborg.org; s=rsa1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=h4kbD4QiBaOHyq8URESUECLWmkxVv78KKf9ZeeqemPw=; b=j/b+3bTpgx//cBYCTkSD5IvE/fQE5DyJf9qP1sb4N150KlRN2mexNWwARXNa50rTUYPGPNB+B0nAg r36N3w76MM11u6aSECyJUN/3wsvXVatAe9oZkOABUI9f62EOp+l+c3Ur6p1dSRzfQOcjZFBbcUM3e8 jF69dwiv6Zie0c69fcoIa3WfrzQCWmVQLOCOzKGHvLYsVZr0NMJahslf9/P8ub0P2IZI/ZprklT19p GmNnJFz7rjdftZQNQ+MAeuvcDFq4a3bXxqkU7M9bwaxu5yN79vW196pMVNc9KE44pKmQnDbbxdBF+l dcxbOBOVt3RRGEkgENNt0p5djLi+pEw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ravnborg.org; s=ed1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=h4kbD4QiBaOHyq8URESUECLWmkxVv78KKf9ZeeqemPw=; b=hbXKfNbahfl1rszE5RCHdmHCDh0CUF/kv9YVkXkPMgOfikPCNpntxGsOvHR5Iwn2yl7a+3fM+pzbi ngkX8XbDA== X-HalOne-Cookie: 3cadd61769b7b3314661320526b2b3c09a9cd1b5 X-HalOne-ID: a7b878f7-0533-11ed-a917-d0431ea8a290 Received: from mailproxy1.cst.dirpod3-cph3.one.com (2-105-2-98-cable.dk.customer.tdc.net [2.105.2.98]) by mailrelay2.pub.mailoutpod1-cph3.one.com (Halon) with ESMTPSA id a7b878f7-0533-11ed-a917-d0431ea8a290; Sat, 16 Jul 2022 18:18:13 +0000 (UTC) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v1 10/11] drm/dri1: Move Kconfig logic to drm/dri1 Date: Sat, 16 Jul 2022 20:17:49 +0200 Message-Id: <20220716181750.3874838-11-sam@ravnborg.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220716181750.3874838-1-sam@ravnborg.org> References: <20220716181750.3874838-1-sam@ravnborg.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Javier Martinez Canillas , Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Move the DRI1 section from drm/Kconfig to a new Kconfig file that lives in the dri1/ directory. This isolates more of the DRI1 functionality. Signed-off-by: Sam Ravnborg Reviewed-by: Javier Martinez Canillas --- drivers/gpu/drm/Kconfig | 77 +---------------------------------- drivers/gpu/drm/dri1/Kconfig | 79 ++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 76 deletions(-) create mode 100644 drivers/gpu/drm/dri1/Kconfig diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 024081480fcf..fd2684c7481f 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -403,82 +403,7 @@ config DRM_HYPERV If M is selected the module will be called hyperv_drm. # Keep legacy DRI1 drivers last - -menuconfig DRM_DRI1 - bool "Enable legacy DRI1 drivers (DANGEROUS)" - depends on DRM && MMU - help - Enable legacy DRI1 drivers. Those drivers expose unsafe and dangerous - APIs to user-space, which can be used to circumvent access - restrictions and other security measures. For backwards compatibility - those drivers are still available, but their use is highly - inadvisable and might harm your system. - - You are recommended to use the safe modeset-only drivers instead, and - perform 3D emulation in user-space. - - Unless you have strong reasons to go rogue, say "N". - -if DRM_DRI1 - -config DRM_TDFX - tristate "3dfx Banshee/Voodoo3+" - depends on DRM && PCI - help - Choose this option if you have a 3dfx Banshee or Voodoo3 (or later), - graphics card. If M is selected, the module will be called tdfx. - -config DRM_R128 - tristate "ATI Rage 128" - depends on DRM && PCI - select FW_LOADER - help - Choose this option if you have an ATI Rage 128 graphics card. If M - is selected, the module will be called r128. AGP support for - this card is strongly suggested (unless you have a PCI version). - -config DRM_I810 - tristate "Intel I810" - # !PREEMPTION because of missing ioctl locking - depends on DRM && AGP && AGP_INTEL && (!PREEMPTION || BROKEN) - help - Choose this option if you have an Intel I810 graphics card. If M is - selected, the module will be called i810. AGP support is required - for this driver to work. - -config DRM_MGA - tristate "Matrox g200/g400" - depends on DRM && PCI - select FW_LOADER - help - Choose this option if you have a Matrox G200, G400 or G450 graphics - card. If M is selected, the module will be called mga. AGP - support is required for this driver to work. - -config DRM_SIS - tristate "SiS video cards" - depends on DRM && AGP - depends on FB_SIS || FB_SIS=n - help - Choose this option if you have a SiS 630 or compatible video - chipset. If M is selected the module will be called sis. AGP - support is required for this driver to work. - -config DRM_VIA - tristate "Via unichrome video cards" - depends on DRM && PCI - help - Choose this option if you have a Via unichrome or compatible video - chipset. If M is selected the module will be called via. - -config DRM_SAVAGE - tristate "Savage video cards" - depends on DRM && PCI - help - Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister - chipset. If M is selected the module will be called savage. - -endif # DRM_DRI1 +source "drivers/gpu/drm/dri1/Kconfig" config DRM_EXPORT_FOR_TESTS bool diff --git a/drivers/gpu/drm/dri1/Kconfig b/drivers/gpu/drm/dri1/Kconfig new file mode 100644 index 000000000000..424b9a142aa2 --- /dev/null +++ b/drivers/gpu/drm/dri1/Kconfig @@ -0,0 +1,79 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# DRI1 drm device drivers + +menuconfig DRM_DRI1 + bool "Enable legacy DRI1 drivers (DANGEROUS)" + depends on DRM && MMU + help + Enable legacy DRI1 drivers. Those drivers expose unsafe and dangerous + APIs to user-space, which can be used to circumvent access + restrictions and other security measures. For backwards compatibility + those drivers are still available, but their use is highly + inadvisable and might harm your system. + + You are recommended to use the safe modeset-only drivers instead, and + perform 3D emulation in user-space. + + Unless you have strong reasons to go rogue, say "N". + +if DRM_DRI1 + +config DRM_TDFX + tristate "3dfx Banshee/Voodoo3+" + depends on DRM && PCI + help + Choose this option if you have a 3dfx Banshee or Voodoo3 (or later), + graphics card. If M is selected, the module will be called tdfx. + +config DRM_R128 + tristate "ATI Rage 128" + depends on DRM && PCI + select FW_LOADER + help + Choose this option if you have an ATI Rage 128 graphics card. If M + is selected, the module will be called r128. AGP support for + this card is strongly suggested (unless you have a PCI version). + +config DRM_I810 + tristate "Intel I810" + # !PREEMPTION because of missing ioctl locking + depends on DRM && AGP && AGP_INTEL && (!PREEMPTION || BROKEN) + help + Choose this option if you have an Intel I810 graphics card. If M is + selected, the module will be called i810. AGP support is required + for this driver to work. + +config DRM_MGA + tristate "Matrox g200/g400" + depends on DRM && PCI + select FW_LOADER + help + Choose this option if you have a Matrox G200, G400 or G450 graphics + card. If M is selected, the module will be called mga. AGP + support is required for this driver to work. + +config DRM_SIS + tristate "SiS video cards" + depends on DRM && AGP + depends on FB_SIS || FB_SIS=n + help + Choose this option if you have a SiS 630 or compatible video + chipset. If M is selected the module will be called sis. AGP + support is required for this driver to work. + +config DRM_VIA + tristate "Via unichrome video cards" + depends on DRM && PCI + help + Choose this option if you have a Via unichrome or compatible video + chipset. If M is selected the module will be called via. + +config DRM_SAVAGE + tristate "Savage video cards" + depends on DRM && PCI + help + Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister + chipset. If M is selected the module will be called savage. + +endif # DRM_DRI1 From patchwork Sat Jul 16 18:17:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 12920227 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 2B2C1C433EF for ; Sat, 16 Jul 2022 18:18:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E843114ABE8; Sat, 16 Jul 2022 18:18:43 +0000 (UTC) Received: from mailrelay2-1.pub.mailoutpod1-cph3.one.com (mailrelay2-1.pub.mailoutpod1-cph3.one.com [46.30.210.183]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5893E11B3B4 for ; Sat, 16 Jul 2022 18:18:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravnborg.org; s=rsa1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=MgqcKXSWGAJghPwjHXDECVqbIIh388zeay0Xe1aC0oI=; b=lNiwjS0dtMUVBGzZZxl11UFDQSEiu621ryJtu0qnOBRItxnZwK2aGoOCGKRmhxfjtg/M2FMAVIG+P WyVKrXcXCv/yT5Z8IkqPCCIZQV4lVmIlRq4iTy/D4PTaJLwc3TdpBwHP33WtQ0oKnTuKYlLCYZlnEZ oacjP3t0u2XIYevWA5EDnB27S/5o2UT5Cm2q7IV9Wa34POrR4MVYXfxLNnisbSYSVhFYx8RU2fUFys D/0bX93CWMyCSvoCSSWF2XOQkdtH5MhyL68xdr+aJQwOuMfRutzgEzY5EG82As0Bldhz8ljtxWCB5P Nv1clDLS4P7mlywqpuC9gTql40OlK1A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ravnborg.org; s=ed1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=MgqcKXSWGAJghPwjHXDECVqbIIh388zeay0Xe1aC0oI=; b=lyTvRkP730iQYSd8UTNCQcxCaP2LfbKZIPvb60XvnoNxfo9lVMCMZtA99yBM7HOFs/3wRqF82oAa6 SFXUADHCw== X-HalOne-Cookie: 1c15d79fce480e7eb0ff9c04329b3ae079e84783 X-HalOne-ID: a82568dc-0533-11ed-a917-d0431ea8a290 Received: from mailproxy1.cst.dirpod3-cph3.one.com (2-105-2-98-cable.dk.customer.tdc.net [2.105.2.98]) by mailrelay2.pub.mailoutpod1-cph3.one.com (Halon) with ESMTPSA id a82568dc-0533-11ed-a917-d0431ea8a290; Sat, 16 Jul 2022 18:18:14 +0000 (UTC) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v1 11/11] drm: Move dri1 core files to drm/dri1 Date: Sat, 16 Jul 2022 20:17:50 +0200 Message-Id: <20220716181750.3874838-12-sam@ravnborg.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220716181750.3874838-1-sam@ravnborg.org> References: <20220716181750.3874838-1-sam@ravnborg.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Javier Martinez Canillas , Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To have more of the dri1 specific support in one place move the dri1 core files to the dri1 folder. The files continue to be part of the drm module, we just refer to the files with a folder name. Signed-off-by: Sam Ravnborg Reviewed-by: Javier Martinez Canillas --- drivers/gpu/drm/Makefile | 10 +++++++--- drivers/gpu/drm/{ => dri1}/drm_agpsupport.c | 0 drivers/gpu/drm/{ => dri1}/drm_bufs.c | 0 drivers/gpu/drm/{ => dri1}/drm_context.c | 0 drivers/gpu/drm/{ => dri1}/drm_dma.c | 0 drivers/gpu/drm/{ => dri1}/drm_hashtab.c | 0 drivers/gpu/drm/{ => dri1}/drm_irq.c | 0 drivers/gpu/drm/{ => dri1}/drm_legacy_misc.c | 0 drivers/gpu/drm/{ => dri1}/drm_lock.c | 0 drivers/gpu/drm/{ => dri1}/drm_memory.c | 0 drivers/gpu/drm/{ => dri1}/drm_scatter.c | 0 drivers/gpu/drm/{ => dri1}/drm_vm.c | 0 12 files changed, 7 insertions(+), 3 deletions(-) rename drivers/gpu/drm/{ => dri1}/drm_agpsupport.c (100%) rename drivers/gpu/drm/{ => dri1}/drm_bufs.c (100%) rename drivers/gpu/drm/{ => dri1}/drm_context.c (100%) rename drivers/gpu/drm/{ => dri1}/drm_dma.c (100%) rename drivers/gpu/drm/{ => dri1}/drm_hashtab.c (100%) rename drivers/gpu/drm/{ => dri1}/drm_irq.c (100%) rename drivers/gpu/drm/{ => dri1}/drm_legacy_misc.c (100%) rename drivers/gpu/drm/{ => dri1}/drm_lock.c (100%) rename drivers/gpu/drm/{ => dri1}/drm_memory.c (100%) rename drivers/gpu/drm/{ => dri1}/drm_scatter.c (100%) rename drivers/gpu/drm/{ => dri1}/drm_vm.c (100%) diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index a3bd337bcab4..02ae13a71281 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -18,9 +18,13 @@ drm-y := drm_aperture.o drm_auth.o drm_cache.o \ drm_syncobj.o drm_lease.o drm_writeback.o drm_client.o \ drm_client_modeset.o drm_atomic_uapi.o \ drm_managed.o drm_vblank_work.o -drm-$(CONFIG_DRM_DRI1) += drm_agpsupport.o drm_bufs.o drm_context.o drm_dma.o \ - drm_hashtab.o drm_irq.o drm_legacy_misc.o drm_lock.o \ - drm_memory.o drm_scatter.o drm_vm.o + +drm-$(CONFIG_DRM_DRI1) += dri1/drm_agpsupport.o dri1/drm_bufs.o \ + dri1/drm_context.o dri1/drm_dma.o \ + dri1/drm_hashtab.o dri1/drm_irq.o \ + dri1/drm_legacy_misc.o dri1/drm_lock.o \ + dri1/drm_memory.o dri1/drm_scatter.o \ + dri1/drm_vm.o drm-$(CONFIG_DRM_LIB_RANDOM) += lib/drm_random.o drm-$(CONFIG_COMPAT) += drm_ioc32.o drm-$(CONFIG_DRM_PANEL) += drm_panel.o diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/dri1/drm_agpsupport.c similarity index 100% rename from drivers/gpu/drm/drm_agpsupport.c rename to drivers/gpu/drm/dri1/drm_agpsupport.c diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/dri1/drm_bufs.c similarity index 100% rename from drivers/gpu/drm/drm_bufs.c rename to drivers/gpu/drm/dri1/drm_bufs.c diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/dri1/drm_context.c similarity index 100% rename from drivers/gpu/drm/drm_context.c rename to drivers/gpu/drm/dri1/drm_context.c diff --git a/drivers/gpu/drm/drm_dma.c b/drivers/gpu/drm/dri1/drm_dma.c similarity index 100% rename from drivers/gpu/drm/drm_dma.c rename to drivers/gpu/drm/dri1/drm_dma.c diff --git a/drivers/gpu/drm/drm_hashtab.c b/drivers/gpu/drm/dri1/drm_hashtab.c similarity index 100% rename from drivers/gpu/drm/drm_hashtab.c rename to drivers/gpu/drm/dri1/drm_hashtab.c diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/dri1/drm_irq.c similarity index 100% rename from drivers/gpu/drm/drm_irq.c rename to drivers/gpu/drm/dri1/drm_irq.c diff --git a/drivers/gpu/drm/drm_legacy_misc.c b/drivers/gpu/drm/dri1/drm_legacy_misc.c similarity index 100% rename from drivers/gpu/drm/drm_legacy_misc.c rename to drivers/gpu/drm/dri1/drm_legacy_misc.c diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/dri1/drm_lock.c similarity index 100% rename from drivers/gpu/drm/drm_lock.c rename to drivers/gpu/drm/dri1/drm_lock.c diff --git a/drivers/gpu/drm/drm_memory.c b/drivers/gpu/drm/dri1/drm_memory.c similarity index 100% rename from drivers/gpu/drm/drm_memory.c rename to drivers/gpu/drm/dri1/drm_memory.c diff --git a/drivers/gpu/drm/drm_scatter.c b/drivers/gpu/drm/dri1/drm_scatter.c similarity index 100% rename from drivers/gpu/drm/drm_scatter.c rename to drivers/gpu/drm/dri1/drm_scatter.c diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/dri1/drm_vm.c similarity index 100% rename from drivers/gpu/drm/drm_vm.c rename to drivers/gpu/drm/dri1/drm_vm.c