Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/xe: Prefer GT oriented messages in xe_force_wake.c
If possible, we should prefer xe_gt_notice() over drm_notice().
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240611163537.1944-2-michal.wajdeczko@intel.com
+5
-12
+5
-12
drivers/gpu/drm/xe/xe_force_wake.c
+5
-12
drivers/gpu/drm/xe/xe_force_wake.c
···
10
10
#include "regs/xe_gt_regs.h"
11
11
#include "regs/xe_reg_defs.h"
12
12
#include "xe_gt.h"
13
+
#include "xe_gt_printk.h"
13
14
#include "xe_mmio.h"
14
15
15
16
#define XE_FORCE_WAKE_ACK_TIMEOUT_MS 50
···
19
18
fw_to_gt(struct xe_force_wake *fw)
20
19
{
21
20
return fw->gt;
22
-
}
23
-
24
-
static struct xe_device *
25
-
fw_to_xe(struct xe_force_wake *fw)
26
-
{
27
-
return gt_to_xe(fw_to_gt(fw));
28
21
}
29
22
30
23
static void domain_init(struct xe_force_wake_domain *domain,
···
130
135
int xe_force_wake_get(struct xe_force_wake *fw,
131
136
enum xe_force_wake_domains domains)
132
137
{
133
-
struct xe_device *xe = fw_to_xe(fw);
134
138
struct xe_gt *gt = fw_to_gt(fw);
135
139
struct xe_force_wake_domain *domain;
136
140
enum xe_force_wake_domains tmp, woken = 0;
···
147
153
ret = domain_wake_wait(gt, domain);
148
154
ret2 |= ret;
149
155
if (ret)
150
-
drm_notice(&xe->drm, "Force wake domain (%d) failed to ack wake, ret=%d\n",
151
-
domain->id, ret);
156
+
xe_gt_notice(gt, "Force wake domain (%d) failed to ack wake, ret=%d\n",
157
+
domain->id, ret);
152
158
}
153
159
fw->awake_domains |= woken;
154
160
spin_unlock_irqrestore(&fw->lock, flags);
···
159
165
int xe_force_wake_put(struct xe_force_wake *fw,
160
166
enum xe_force_wake_domains domains)
161
167
{
162
-
struct xe_device *xe = fw_to_xe(fw);
163
168
struct xe_gt *gt = fw_to_gt(fw);
164
169
struct xe_force_wake_domain *domain;
165
170
enum xe_force_wake_domains tmp, sleep = 0;
···
176
183
ret = domain_sleep_wait(gt, domain);
177
184
ret2 |= ret;
178
185
if (ret)
179
-
drm_notice(&xe->drm, "Force wake domain (%d) failed to ack sleep, ret=%d\n",
180
-
domain->id, ret);
186
+
xe_gt_notice(gt, "Force wake domain (%d) failed to ack sleep, ret=%d\n",
187
+
domain->id, ret);
181
188
}
182
189
fw->awake_domains &= ~sleep;
183
190
spin_unlock_irqrestore(&fw->lock, flags);