Re: [PATCH v1 01/11] drm: rename DRIVER_LEGACY to DRIVER_DRI1

[Javier Martinez Canillas]

Hello Sam,

Thanks a lot for working on this patch-set.

On 7/16/22 20:17, Sam Ravnborg wrote:
> "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 

IIRC it was Thomas who suggested the s/DRIVER_LEGACY/DRIVER_DRI1
rename, while I suggested the move to a separate dri1 directory.

> Signed-off-by: Sam Ravnborg 
> ---

Reviewed-by: Javier Martinez Canillas 

[...]

>   if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) &&

Not for this series but I wonder when this could be dropped since is
only used by nouveau and only when CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT
is enabled.

AFAIK this is only needed for an old nouveau DDX so I wonder whether
someone even still uses that in practice. For example, we don't even
set CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT in the Fedora kernel configs.

--
Best regards,

Javier Martinez Canillas
Linux Engineering
Red Hat

[PATCH v1 01/11] drm: rename DRIVER_LEGACY to DRIVER_DRI1

[Sam Ravnborg]

"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 
---
 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;