diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-amd/0015-drm-radeon-add-uvd-debugfs-support.patch')
-rw-r--r-- | common/recipes-kernel/linux/linux-amd/0015-drm-radeon-add-uvd-debugfs-support.patch | 99 |
1 files changed, 0 insertions, 99 deletions
diff --git a/common/recipes-kernel/linux/linux-amd/0015-drm-radeon-add-uvd-debugfs-support.patch b/common/recipes-kernel/linux/linux-amd/0015-drm-radeon-add-uvd-debugfs-support.patch deleted file mode 100644 index e6c3622e..00000000 --- a/common/recipes-kernel/linux/linux-amd/0015-drm-radeon-add-uvd-debugfs-support.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 9829c84462af6185df98889073adaec5c56b3f9d Mon Sep 17 00:00:00 2001 -From: Leo Liu <leo.liu@amd.com> -Date: Mon, 25 Nov 2013 17:25:41 -0500 -Subject: [PATCH 15/60] drm/radeon: add uvd debugfs support - -Signed-off-by: Leo Liu <leo.liu@amd.com> ---- - drivers/gpu/drm/radeon/radeon.h | 1 + - drivers/gpu/drm/radeon/radeon_uvd.c | 37 +++++++++++++++++++++++++++++++++++++ - 2 files changed, 38 insertions(+) - -diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h -index 133e9ad..7b31922 100644 ---- a/drivers/gpu/drm/radeon/radeon.h -+++ b/drivers/gpu/drm/radeon/radeon.h -@@ -1555,6 +1555,7 @@ struct radeon_uvd { - struct drm_file *filp[RADEON_MAX_UVD_HANDLES]; - unsigned img_size[RADEON_MAX_UVD_HANDLES]; - struct delayed_work idle_work; -+ bool status; - }; - - int radeon_uvd_init(struct radeon_device *rdev); -diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c -index a656b1a..a21a6af 100644 ---- a/drivers/gpu/drm/radeon/radeon_uvd.c -+++ b/drivers/gpu/drm/radeon/radeon_uvd.c -@@ -53,6 +53,7 @@ MODULE_FIRMWARE(FIRMWARE_TAHITI); - MODULE_FIRMWARE(FIRMWARE_BONAIRE); - - static void radeon_uvd_idle_work_handler(struct work_struct *work); -+static int radeon_debugfs_uvd_init(struct radeon_device *rdev); - - int radeon_uvd_init(struct radeon_device *rdev) - { -@@ -143,6 +144,10 @@ int radeon_uvd_init(struct radeon_device *rdev) - return r; - } - -+ r = radeon_debugfs_uvd_init(rdev); -+ if (r) -+ dev_err(rdev->dev, "(%d) Register debugfs file for uvd failed\n", r); -+ - radeon_bo_unreserve(rdev->uvd.vcpu_bo); - - for (i = 0; i < RADEON_MAX_UVD_HANDLES; ++i) { -@@ -792,6 +797,7 @@ static void radeon_uvd_idle_work_handler(struct work_struct *work) - schedule_delayed_work(&rdev->uvd.idle_work, - msecs_to_jiffies(UVD_IDLE_TIMEOUT_MS)); - } -+ rdev->uvd.status = false; - } - - void radeon_uvd_note_usage(struct radeon_device *rdev) -@@ -819,6 +825,7 @@ void radeon_uvd_note_usage(struct radeon_device *rdev) - } else { - radeon_set_uvd_clocks(rdev, 53300, 40000); - } -+ rdev->uvd.status = true; - } - } - -@@ -958,3 +965,33 @@ int radeon_uvd_send_upll_ctlreq(struct radeon_device *rdev, - - return 0; - } -+ -+/* -+ * Debugfs info -+ */ -+#if defined(CONFIG_DEBUG_FS) -+ -+static int radeon_debugfs_uvd_info(struct seq_file *m, void *data) -+{ -+ struct drm_info_node *node = (struct drm_info_node *) m->private; -+ struct drm_device *dev = node->minor->dev; -+ struct radeon_device *rdev = dev->dev_private; -+ -+ seq_printf(m, "UVD Status: %s\n", ((rdev->uvd.status) ? "Busy" : "Idle")); -+ -+ return 0; -+} -+ -+static struct drm_info_list radeon_uvd_info_list[] = { -+ {"radeon_uvd_info", radeon_debugfs_uvd_info, 0, NULL}, -+}; -+#endif -+ -+static int radeon_debugfs_uvd_init(struct radeon_device *rdev) -+{ -+#if defined(CONFIG_DEBUG_FS) -+ return radeon_debugfs_add_files(rdev, radeon_uvd_info_list, ARRAY_SIZE(radeon_uvd_info_list)); -+#else -+ return 0; -+#endif -+} --- -1.9.1 - |