mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 12:57:53 +00:00
07fbd1f85d
Now that struct xe_reg and struct xe_reg_mcr are types that can be used by xe, convert more of the driver to use them. Some notes about the conversions: - The RTP tables don't need the MASKED flags anymore in the actions as that information now comes from the register definition - There is no need for the _XE_RTP_REG/_XE_RTP_REG_MCR macros and the register types on RTP infra: that comes from the register definitions. - When declaring the RTP entries, there is no need anymore to undef XE_REG and friends: the RTP macros deal with removing the cast where needed due to not being able to use a compound statement for initialization in the tables - The index in the reg-sr xarray is the register offset only. Otherwise we wouldn't catch mistakes about adding both a MCR-style and normal-style registers. For that, the register is now also part of the entry, so the options can be compared to check for compatible entries. In order to be able to accomplish this, some improvements are needed on the RTP macros. Change its implementation to concentrate on "pasting a prefix to each argument" rather than the more general "call any macro for each argument". Hopefully this will avoid trying to extend this infra and making it more complex. With the use of tuples for building the arguments, it's not possible to pass additional register fields and using xe_reg in the RTP tables. xe_mmio_* still need to be converted, from u32 to xe_reg, but that is left for another change. Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Link: https://lore.kernel.org/r/20230427223256.1432787-10-lucas.demarchi@intel.com Link: https://lore.kernel.org/r/20230427223256.1432787-6-lucas.demarchi@intel.com Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
37 lines
635 B
C
37 lines
635 B
C
/* SPDX-License-Identifier: MIT */
|
|
/*
|
|
* Copyright © 2022 Intel Corporation
|
|
*/
|
|
|
|
#ifndef _XE_REG_SR_TYPES_
|
|
#define _XE_REG_SR_TYPES_
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/xarray.h>
|
|
|
|
#include "regs/xe_reg_defs.h"
|
|
|
|
struct xe_reg_sr_entry {
|
|
struct xe_reg reg;
|
|
u32 clr_bits;
|
|
u32 set_bits;
|
|
/* Mask for bits to consider when reading value back */
|
|
u32 read_mask;
|
|
};
|
|
|
|
struct xe_reg_sr {
|
|
struct {
|
|
struct xe_reg_sr_entry *arr;
|
|
unsigned int used;
|
|
unsigned int allocated;
|
|
unsigned int grow_step;
|
|
} pool;
|
|
struct xarray xa;
|
|
const char *name;
|
|
|
|
#if IS_ENABLED(CONFIG_DRM_XE_KUNIT_TEST)
|
|
unsigned int errors;
|
|
#endif
|
|
};
|
|
|
|
#endif
|