From: Matt Roper Date: Thu, 23 Feb 2023 18:57:40 +0000 (-0800) Subject: drm/xe/mocs: Drop HAS_RENDER_L3CC flag X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=90385dcfc040648e928a883298a19e2afbba41e5;p=linux.git drm/xe/mocs: Drop HAS_RENDER_L3CC flag The HAS_RENDER_L3CC is set unconditionally so there's no need to keep it as a dedicated flag. For error checking purposes, we can just make sure the 'table' field is initialized properly. Cc: Lucas De Marchi Suggested-by: Lucas De Marchi Signed-off-by: Matt Roper Reviewed-by: Lucas De Marchi Signed-off-by: Rodrigo Vivi --- diff --git a/drivers/gpu/drm/xe/xe_mocs.c b/drivers/gpu/drm/xe/xe_mocs.c index ef237853fdab3..e09c6242aafc0 100644 --- a/drivers/gpu/drm/xe/xe_mocs.c +++ b/drivers/gpu/drm/xe/xe_mocs.c @@ -25,7 +25,6 @@ static inline void mocs_dbg(const struct drm_device *dev, enum { HAS_GLOBAL_MOCS = BIT(0), - HAS_RENDER_L3CC = BIT(1), }; struct xe_mocs_entry { @@ -440,10 +439,11 @@ static unsigned int get_mocs_settings(struct xe_device *xe, */ XE_WARN_ON(info->unused_entries_index == 0); - if (XE_WARN_ON(info->size > info->n_entries)) + if (XE_WARN_ON(info->size > info->n_entries)) { + info->table = NULL; return 0; + } - flags = HAS_RENDER_L3CC; if (!IS_DGFX(xe)) flags |= HAS_GLOBAL_MOCS; @@ -538,6 +538,6 @@ void xe_mocs_init(struct xe_gt *gt) * sure the LNCFCMOCSx registers are programmed for the subsequent * memory transactions including guc transactions */ - if (flags & HAS_RENDER_L3CC) + if (table.table) init_l3cc_table(gt, &table); }