proxmox-mirrors/mirror_ubuntu-kernels
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_ubuntu-kernels.git synced 2025-11-23 15:09:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/xe/mocs: Move warn/assertion up

Browse Source 
The warn-once in __init_mocs_table() to make sure there's an index set
for unused entries is more a sanity check that should be done as the
first thing in that function. The kunit test replicates the same check,
so also move it up and turn it into a failure condition for the test.

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240228061048.3661978-4-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
This commit is contained in:
Lucas De Marchi 2024-02-27 22:10:46 -08:00
parent d40c6c45fb
commit 17c20e3b50
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/xe/tests/xe_mocs.c
View File

@ -79,11 +79,12 @@ static void read_mocs_table(struct xe_gt *gt,
struct kunit *test = xe_cur_kunit(); struct kunit *test = xe_cur_kunit();
KUNIT_EXPECT_TRUE_MSG(test, info->unused_entries_index,
"Unused entries index should have been defined\n");
ret = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT); ret = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
KUNIT_ASSERT_EQ_MSG(test, ret, 0, "Forcewake Failed.\n"); KUNIT_ASSERT_EQ_MSG(test, ret, 0, "Forcewake Failed.\n");
mocs_dbg(&gt_to_xe(gt)->drm, "Global MOCS entries:%d\n", info->n_entries); mocs_dbg(&gt_to_xe(gt)->drm, "Global MOCS entries:%d\n", info->n_entries);
drm_WARN_ONCE(&xe->drm, !info->unused_entries_index,
"Unused entries index should have been defined\n");
for (i = 0; i < info->n_entries; i++) { for (i = 0; i < info->n_entries; i++) {
mocs = get_entry_control(info, i); mocs = get_entry_control(info, i);

4
drivers/gpu/drm/xe/xe_mocs.c
View File

@ -470,9 +470,11 @@ static void __init_mocs_table(struct xe_gt *gt,
unsigned int i; unsigned int i;
u32 mocs; u32 mocs;
mocs_dbg(&gt_to_xe(gt)->drm, "mocs entries: %d\n", info->n_entries);
drm_WARN_ONCE(&xe->drm, !info->unused_entries_index, drm_WARN_ONCE(&xe->drm, !info->unused_entries_index,
"Unused entries index should have been defined\n"); "Unused entries index should have been defined\n");
mocs_dbg(&gt_to_xe(gt)->drm, "mocs entries: %d\n", info->n_entries);
for (i = 0; i < info->n_entries; i++) { for (i = 0; i < info->n_entries; i++) {
mocs = get_entry_control(info, i); mocs = get_entry_control(info, i);