[Intel-xe] [PATCH v2 7/7] drm/xe/mocs: Drop HAS_RENDER_L3CC flag

[Lucas De Marchi]

On Thu, Feb 23, 2023 at 10:57:40AM -0800, Matt Roper wrote:
>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 <lucas.demarchi at intel.com>
>Suggested-by: Lucas De Marchi <lucas.demarchi at intel.com>
>Signed-off-by: Matt Roper <matthew.d.roper at intel.com>


Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>


Lucas De Marchi

>---
> drivers/gpu/drm/xe/xe_mocs.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_mocs.c b/drivers/gpu/drm/xe/xe_mocs.c
>index c019352ba7a8..1781cbfdd0f4 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);
> }
>-- 
>2.39.1
>