From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Iouri Tarassov Date: Thu, 24 Mar 2022 15:03:41 -0700 Subject: drivers: hv: dxgkrnl: Use tracing instead of dev_dbg Signed-off-by: Iouri Tarassov [kms: Forward port to v6.1] Signed-off-by: Kelsey Steele --- drivers/hv/dxgkrnl/dxgadapter.c | 4 +-- drivers/hv/dxgkrnl/dxgmodule.c | 5 ++- drivers/hv/dxgkrnl/dxgprocess.c | 6 ++-- drivers/hv/dxgkrnl/dxgvmbus.c | 4 +-- drivers/hv/dxgkrnl/hmgr.c | 16 +++++----- drivers/hv/dxgkrnl/ioctl.c | 8 ++--- drivers/hv/dxgkrnl/misc.c | 4 +-- 7 files changed, 25 insertions(+), 22 deletions(-) diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapter.c index 236febbc6fca..3d8bec295b87 100644 --- a/drivers/hv/dxgkrnl/dxgadapter.c +++ b/drivers/hv/dxgkrnl/dxgadapter.c @@ -18,8 +18,8 @@ #include "dxgkrnl.h" -#undef pr_fmt -#define pr_fmt(fmt) "dxgk: " fmt +#undef dev_fmt +#define dev_fmt(fmt) "dxgk: " fmt int dxgadapter_set_vmbus(struct dxgadapter *adapter, struct hv_device *hdev) { diff --git a/drivers/hv/dxgkrnl/dxgmodule.c b/drivers/hv/dxgkrnl/dxgmodule.c index af51fcd35697..08feae97e845 100644 --- a/drivers/hv/dxgkrnl/dxgmodule.c +++ b/drivers/hv/dxgkrnl/dxgmodule.c @@ -24,6 +24,9 @@ #undef pr_fmt #define pr_fmt(fmt) "dxgk: " fmt +#undef dev_fmt +#define dev_fmt(fmt) "dxgk: " fmt + /* * Interface from dxgglobal */ @@ -442,7 +445,7 @@ const struct file_operations dxgk_fops = { #define DXGK_VMBUS_HOSTCAPS_OFFSET (DXGK_VMBUS_VGPU_LUID_OFFSET + \ sizeof(struct winluid)) -/* The guest writes its capavilities to this adderss */ +/* The guest writes its capabilities to this address */ #define DXGK_VMBUS_GUESTCAPS_OFFSET (DXGK_VMBUS_VERSION_OFFSET + \ sizeof(u32)) diff --git a/drivers/hv/dxgkrnl/dxgprocess.c b/drivers/hv/dxgkrnl/dxgprocess.c index 5de3f8ccb448..afef196c0588 100644 --- a/drivers/hv/dxgkrnl/dxgprocess.c +++ b/drivers/hv/dxgkrnl/dxgprocess.c @@ -13,8 +13,8 @@ #include "dxgkrnl.h" -#undef pr_fmt -#define pr_fmt(fmt) "dxgk: " fmt +#undef dev_fmt +#define dev_fmt(fmt) "dxgk: " fmt /* * Creates a new dxgprocess object @@ -248,7 +248,7 @@ struct dxgadapter *dxgprocess_adapter_by_handle(struct dxgprocess *process, HMGRENTRY_TYPE_DXGADAPTER, handle); if (adapter == NULL) - DXG_ERR("adapter_by_handle failed %x", handle.v); + DXG_TRACE("adapter_by_handle failed %x", handle.v); else if (kref_get_unless_zero(&adapter->adapter_kref) == 0) { DXG_ERR("failed to acquire adapter reference"); adapter = NULL; diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c index 913ea3cabb31..d53d4254be63 100644 --- a/drivers/hv/dxgkrnl/dxgvmbus.c +++ b/drivers/hv/dxgkrnl/dxgvmbus.c @@ -22,8 +22,8 @@ #include "dxgkrnl.h" #include "dxgvmbus.h" -#undef pr_fmt -#define pr_fmt(fmt) "dxgk: " fmt +#undef dev_fmt +#define dev_fmt(fmt) "dxgk: " fmt #define RING_BUFSIZE (256 * 1024) diff --git a/drivers/hv/dxgkrnl/hmgr.c b/drivers/hv/dxgkrnl/hmgr.c index 526b50f46d96..24101d0091ab 100644 --- a/drivers/hv/dxgkrnl/hmgr.c +++ b/drivers/hv/dxgkrnl/hmgr.c @@ -19,8 +19,8 @@ #include "dxgkrnl.h" #include "hmgr.h" -#undef pr_fmt -#define pr_fmt(fmt) "dxgk: " fmt +#undef dev_fmt +#define dev_fmt(fmt) "dxgk: " fmt const struct d3dkmthandle zerohandle; @@ -90,29 +90,29 @@ static bool is_handle_valid(struct hmgrtable *table, struct d3dkmthandle h, struct hmgrentry *entry; if (index >= table->table_size) { - DXG_ERR("Invalid index %x %d", h.v, index); + DXG_TRACE("Invalid index %x %d", h.v, index); return false; } entry = &table->entry_table[index]; if (unique != entry->unique) { - DXG_ERR("Invalid unique %x %d %d %d %p", + DXG_TRACE("Invalid unique %x %d %d %d %p", h.v, unique, entry->unique, index, entry->object); return false; } if (entry->destroyed && !ignore_destroyed) { - DXG_ERR("Invalid destroyed value"); + DXG_TRACE("Invalid destroyed value"); return false; } if (entry->type == HMGRENTRY_TYPE_FREE) { - DXG_ERR("Entry is freed %x %d", h.v, index); + DXG_TRACE("Entry is freed %x %d", h.v, index); return false; } if (t != HMGRENTRY_TYPE_FREE && t != entry->type) { - DXG_ERR("type mismatch %x %d %d", h.v, t, entry->type); + DXG_TRACE("type mismatch %x %d %d", h.v, t, entry->type); return false; } @@ -500,7 +500,7 @@ void *hmgrtable_get_object_by_type(struct hmgrtable *table, struct d3dkmthandle h) { if (!is_handle_valid(table, h, false, type)) { - DXG_ERR("Invalid handle %x", h.v); + DXG_TRACE("Invalid handle %x", h.v); return NULL; } return table->entry_table[get_index(h)].object; diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c index 6c26aafb0619..4db23cd55b24 100644 --- a/drivers/hv/dxgkrnl/ioctl.c +++ b/drivers/hv/dxgkrnl/ioctl.c @@ -21,8 +21,8 @@ #include "dxgvmbus.h" #include "dxgsyncfile.h" -#undef pr_fmt -#define pr_fmt(fmt) "dxgk: " fmt +#undef dev_fmt +#define dev_fmt(fmt) "dxgk: " fmt struct ioctl_desc { int (*ioctl_callback)(struct dxgprocess *p, void __user *arg); @@ -556,7 +556,7 @@ dxgkio_enum_adapters3(struct dxgprocess *process, void *__user inargs) cleanup: - DXG_TRACE("ioctl: %s %d", errorstr(ret), ret); + DXG_TRACE("ioctl:%s %d", errorstr(ret), ret); return ret; } @@ -5242,7 +5242,7 @@ static int dxgk_ioctl(struct file *f, unsigned int p1, unsigned long p2) int status; struct dxgprocess *process; - if (code < 1 || code >= ARRAY_SIZE(ioctls)) { + if (code < 1 || code >= ARRAY_SIZE(ioctls)) { DXG_ERR("bad ioctl %x %x %x %x", code, _IOC_TYPE(p1), _IOC_SIZE(p1), _IOC_DIR(p1)); return -ENOTTY; diff --git a/drivers/hv/dxgkrnl/misc.c b/drivers/hv/dxgkrnl/misc.c index 4a1309d80ee5..4bf6fe80d22a 100644 --- a/drivers/hv/dxgkrnl/misc.c +++ b/drivers/hv/dxgkrnl/misc.c @@ -18,8 +18,8 @@ #include "dxgkrnl.h" #include "misc.h" -#undef pr_fmt -#define pr_fmt(fmt) "dxgk: " fmt +#undef dev_fmt +#define dev_fmt(fmt) "dxgk: " fmt u16 *wcsncpy(u16 *dest, const u16 *src, size_t n) { -- Armbian