From babba646785d6855cba64fb0480beb8d3421cc52 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Fri, 22 Sep 2023 10:43:20 -0700 Subject: [PATCH] drm/xe: Accept a const xe device Depending on the context, it's preferred to have a const pointer to make sure nothing is modified underneath. The assert macros only ever read data from xe/tile/gt for printing, so they can be made const by default. Reviewed-by: Michal Wajdeczko Link: https://lore.kernel.org/r/20230922174320.2372617-1-lucas.demarchi@intel.com Signed-off-by: Lucas De Marchi Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/xe/xe_assert.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_assert.h b/drivers/gpu/drm/xe/xe_assert.h index 962aac1bc7648..34c142e6cfb09 100644 --- a/drivers/gpu/drm/xe/xe_assert.h +++ b/drivers/gpu/drm/xe/xe_assert.h @@ -86,7 +86,7 @@ }) #else #define __xe_assert_msg(xe, condition, msg, arg...) ({ \ - typecheck(struct xe_device *, xe); \ + typecheck(const struct xe_device *, xe); \ BUILD_BUG_ON_INVALID(condition); \ }) #endif @@ -107,7 +107,7 @@ */ #define xe_assert(xe, condition) xe_assert_msg((xe), condition, "") #define xe_assert_msg(xe, condition, msg, arg...) ({ \ - struct xe_device *__xe = (xe); \ + const struct xe_device *__xe = (xe); \ __xe_assert_msg(__xe, condition, \ "platform: %d subplatform: %d\n" \ "graphics: %s %u.%02u step %s\n" \ @@ -142,7 +142,7 @@ */ #define xe_tile_assert(tile, condition) xe_tile_assert_msg((tile), condition, "") #define xe_tile_assert_msg(tile, condition, msg, arg...) ({ \ - struct xe_tile *__tile = (tile); \ + const struct xe_tile *__tile = (tile); \ char __buf[10] __maybe_unused; \ xe_assert_msg(tile_to_xe(__tile), condition, "tile: %u VRAM %s\n" msg, \ __tile->id, ({ string_get_size(__tile->mem.vram.actual_physical_size, 1, \ @@ -166,7 +166,7 @@ */ #define xe_gt_assert(gt, condition) xe_gt_assert_msg((gt), condition, "") #define xe_gt_assert_msg(gt, condition, msg, arg...) ({ \ - struct xe_gt *__gt = (gt); \ + const struct xe_gt *__gt = (gt); \ xe_tile_assert_msg(gt_to_tile(__gt), condition, "GT: %u type %d\n" msg, \ __gt->info.id, __gt->info.type, ## arg); \ }) -- 2.30.2