[openchrome-devel] drm-openchrome: Branch 'drm-next-6.1' - 2 commits - drivers/gpu/drm

[Kevin Brace]

 drivers/gpu/drm/via/via_drv.h  |    5 ++---
 drivers/gpu/drm/via/via_init.c |    4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit a2038a3f01c6b778d1caf3bf53b6595a840a0a73
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Mon Dec 5 09:54:11 2022 -0600

    drm/via: Version bumped to 3.6.1
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 1b837464085b..b91c64183271 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -50,10 +50,10 @@
 
 #define DRIVER_MAJOR		3
 #define DRIVER_MINOR		6
-#define DRIVER_PATCHLEVEL	0
+#define DRIVER_PATCHLEVEL	1
 #define DRIVER_NAME		"via"
 #define DRIVER_DESC		"OpenChrome DRM for VIA Technologies Chrome"
-#define DRIVER_DATE		"20220908"
+#define DRIVER_DATE		"20221205"
 #define DRIVER_AUTHOR		"OpenChrome Project"
 
 
commit 2cb71effe40116314cf1e37d3be106807ad77a2a
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Mon Dec 5 09:11:49 2022 -0600

    drm/via: Add via_ to chip_revision_info()
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 282231c467ac..1b837464085b 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -337,7 +337,6 @@ void via_vram_fini(struct via_drm_priv *dev_priv);
 int via_mmio_init(struct via_drm_priv *dev_priv);
 void via_mmio_fini(struct via_drm_priv *dev_priv);
 void via_graphics_unlock(struct via_drm_priv *dev_priv);
-void chip_revision_info(struct via_drm_priv *dev_priv);
 int via_device_init(struct via_drm_priv *dev_priv);
 void via_device_fini(struct via_drm_priv *dev_priv);
 void via_mode_config_init(struct via_drm_priv *dev_priv);
diff --git a/drivers/gpu/drm/via/via_init.c b/drivers/gpu/drm/via/via_init.c
index 0e478b974628..f3cf17a3b1b8 100644
--- a/drivers/gpu/drm/via/via_init.c
+++ b/drivers/gpu/drm/via/via_init.c
@@ -1116,7 +1116,7 @@ void via_graphics_unlock(struct via_drm_priv *dev_priv)
 	DRM_DEBUG_KMS("Exiting %s.\n", __func__);
 }
 
-void chip_revision_info(struct via_drm_priv *dev_priv)
+static void via_chip_revision_info(struct via_drm_priv *dev_priv)
 {
 	struct drm_device *dev = &dev_priv->dev;
 	struct pci_dev *pdev = to_pci_dev(dev->dev);
@@ -1266,7 +1266,7 @@ int via_drm_init(struct drm_device *dev)
 		goto exit;
 	}
 
-	chip_revision_info(dev_priv);
+	via_chip_revision_info(dev_priv);
 
 	ret = via_modeset_init(dev);
 	if (ret) {