drm-openchrome: Branch 'drm-next-6.8' - 2 commits - drivers/gpu/drm

[Kevin Brace]

 drivers/gpu/drm/via/via_drv.h    |    5 +++--
 drivers/gpu/drm/via/via_object.c |    1 +
 drivers/gpu/drm/via/via_ttm.c    |   19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

New commits:
commit 7af98a757e9608c17c28ed98fa34ab0eff16b094
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date:   Thu Feb 15 12:40:46 2024 -0800

    drm/via: Version bumped to 3.6.14
    
    Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>

diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 544963869e78..c2110b9687bb 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -44,10 +44,10 @@
 
 #define DRIVER_MAJOR           3
 #define DRIVER_MINOR           6
-#define DRIVER_PATCHLEVEL      13
+#define DRIVER_PATCHLEVEL      14
 #define DRIVER_NAME            "via"
 #define DRIVER_DESC            "OpenChrome DRM for VIA Technologies Chrome"
-#define DRIVER_DATE            "20240115"
+#define DRIVER_DATE            "20240215"
 #define DRIVER_AUTHOR          "OpenChrome Project"
 
 
commit e132439a52f1260ecbf91eb7e7332c3592380946
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date:   Thu Feb 15 12:28:58 2024 -0800

    drm/via: Inaugural support of TTM DebugFS
    
    via_ttm_rman_vram parameter is defined, and it can be accessed from
    /sys/kernel/debug/.
    
    Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>

diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 64ff475c1305..544963869e78 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -379,6 +379,7 @@ int via_dev_pm_ops_resume(struct device *dev);
 
 /* via_ttm.c */
 extern struct ttm_device_funcs via_bo_driver;
+void via_ttm_debugfs_init(struct drm_device *dev);
 
 /* via_tx.c */
 void via_transmitter_io_pad_state(struct drm_device *dev,
diff --git a/drivers/gpu/drm/via/via_object.c b/drivers/gpu/drm/via/via_object.c
index f4e9d33ff319..0a3203614f92 100644
--- a/drivers/gpu/drm/via/via_object.c
+++ b/drivers/gpu/drm/via/via_object.c
@@ -305,6 +305,7 @@ int via_mm_init(struct drm_device *dev)
                goto error_ttm_range_man;
        }
 
+       via_ttm_debugfs_init(dev);
        goto exit;
 error_ttm_range_man:
        ttm_device_fini(&dev_priv->bdev);
diff --git a/drivers/gpu/drm/via/via_ttm.c b/drivers/gpu/drm/via/via_ttm.c
index 68f44446011f..d2febeaaaa14 100644
--- a/drivers/gpu/drm/via/via_ttm.c
+++ b/drivers/gpu/drm/via/via_ttm.c
@@ -31,8 +31,13 @@
  *
  */
 
+#include <linux/dcache.h>
 #include <linux/pci.h>
 
+#include <drm/drm_debugfs.h>
+#include <drm/drm_file.h>
+#include <drm/drm_print.h>
+
 #include <drm/ttm/ttm_bo.h>
 #include <drm/ttm/ttm_tt.h>
 
@@ -180,3 +185,17 @@ struct ttm_device_funcs via_bo_driver = {
        .delete_mem_notify = via_bo_delete_mem_notify,
        .io_mem_reserve = via_bo_io_mem_reserve,
 };
+
+void via_ttm_debugfs_init(struct drm_device *dev)
+{
+#if defined(CONFIG_DEBUG_FS)
+       struct drm_minor *minor = dev->primary;
+       struct dentry *debugfs_root = minor->debugfs_root;
+       struct via_drm_priv *dev_priv = to_via_drm_priv(dev);
+
+       ttm_resource_manager_create_debugfs(ttm_manager_type(&dev_priv->bdev,
+                                                               TTM_PL_VRAM),
+                                               debugfs_root,
+                                               "via_ttm_rman_vram");
+#endif
+}