Commit 4c535cbf authored by Anuj Phogat's avatar Anuj Phogat Committed by Marge Bot
Browse files

intel: Fix alignment and line wrapping due to gen_device renaming


Signed-off-by: Anuj Phogat's avatarAnuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Kenneth Graunke's avatarKenneth Graunke <kenneth@whitecape.org>
Part-of: <!10241>
parent 61e86365
......@@ -370,8 +370,8 @@ int iris_bo_busy(struct iris_bo *bo);
int iris_bo_madvise(struct iris_bo *bo, int madv);
/* drm_bacon_bufmgr_gem.c */
struct iris_bufmgr *iris_bufmgr_get_for_fd(struct intel_device_info *devinfo, int fd,
bool bo_reuse);
struct iris_bufmgr *iris_bufmgr_get_for_fd(struct intel_device_info *devinfo,
int fd, bool bo_reuse);
int iris_bufmgr_get_fd(struct iris_bufmgr *bufmgr);
struct iris_bo *iris_bo_gem_create_from_name(struct iris_bufmgr *bufmgr,
......
......@@ -459,9 +459,10 @@ iris_resource_access_raw(struct iris_context *ice,
}
}
enum isl_dim_layout iris_get_isl_dim_layout(const struct intel_device_info *devinfo,
enum isl_tiling tiling,
enum pipe_texture_target target);
enum isl_dim_layout
iris_get_isl_dim_layout(const struct intel_device_info *devinfo,
enum isl_tiling tiling,
enum pipe_texture_target target);
static inline enum isl_surf_dim
target_to_isl_surf_dim(enum pipe_texture_target target)
{
......
......@@ -52,8 +52,9 @@ static inline uint32_t intel_make_gen(uint32_t major, uint32_t minor)
struct intel_group *intel_spec_find_struct(struct intel_spec *spec, const char *name);
struct intel_spec *intel_spec_load(const struct intel_device_info *devinfo);
struct intel_spec *intel_spec_load_from_path(const struct intel_device_info *devinfo,
const char *path);
struct intel_spec *
intel_spec_load_from_path(const struct intel_device_info *devinfo,
const char *path);
struct intel_spec *intel_spec_load_filename(const char *filename);
void intel_spec_destroy(struct intel_spec *spec);
uint32_t intel_spec_get_gen(struct intel_spec *spec);
......
......@@ -831,7 +831,8 @@ dest(FILE *file, const struct intel_device_info *devinfo, const brw_inst *inst)
}
static int
dest_3src(FILE *file, const struct intel_device_info *devinfo, const brw_inst *inst)
dest_3src(FILE *file, const struct intel_device_info *devinfo,
const brw_inst *inst)
{
bool is_align1 = brw_inst_3src_access_mode(devinfo, inst) == BRW_ALIGN_1;
int err = 0;
......@@ -1102,7 +1103,8 @@ implied_width(enum brw_vertical_stride _vert_stride,
}
static int
src0_3src(FILE *file, const struct intel_device_info *devinfo, const brw_inst *inst)
src0_3src(FILE *file, const struct intel_device_info *devinfo,
const brw_inst *inst)
{
int err = 0;
unsigned reg_nr, subreg_nr;
......@@ -1188,7 +1190,8 @@ src0_3src(FILE *file, const struct intel_device_info *devinfo, const brw_inst *i
}
static int
src1_3src(FILE *file, const struct intel_device_info *devinfo, const brw_inst *inst)
src1_3src(FILE *file, const struct intel_device_info *devinfo,
const brw_inst *inst)
{
int err = 0;
unsigned reg_nr, subreg_nr;
......@@ -1261,7 +1264,8 @@ src1_3src(FILE *file, const struct intel_device_info *devinfo, const brw_inst *i
}
static int
src2_3src(FILE *file, const struct intel_device_info *devinfo, const brw_inst *inst)
src2_3src(FILE *file, const struct intel_device_info *devinfo,
const brw_inst *inst)
{
int err = 0;
unsigned reg_nr, subreg_nr;
......@@ -1606,7 +1610,8 @@ src1(FILE *file, const struct intel_device_info *devinfo, const brw_inst *inst)
}
static int
qtr_ctrl(FILE *file, const struct intel_device_info *devinfo, const brw_inst *inst)
qtr_ctrl(FILE *file, const struct intel_device_info *devinfo,
const brw_inst *inst)
{
int qtr_ctl = brw_inst_qtr_control(devinfo, inst);
int exec_size = 1 << brw_inst_exec_size(devinfo, inst);
......
......@@ -180,9 +180,10 @@ void brw_create_label(struct brw_label **labels, int offset, void *mem_ctx);
int brw_disassemble_inst(FILE *file, const struct intel_device_info *devinfo,
const struct brw_inst *inst, bool is_compacted,
int offset, const struct brw_label *root_label);
const struct brw_label *brw_label_assembly(const struct intel_device_info *devinfo,
const void *assembly, int start, int end,
void *mem_ctx);
const struct
brw_label *brw_label_assembly(const struct intel_device_info *devinfo,
const void *assembly, int start, int end,
void *mem_ctx);
void brw_disassemble_with_labels(const struct intel_device_info *devinfo,
const void *assembly, int start, int end, FILE *out);
void brw_disassemble(const struct intel_device_info *devinfo,
......@@ -317,7 +318,8 @@ brw_message_desc_rlen(const struct intel_device_info *devinfo, uint32_t desc)
}
static inline bool
brw_message_desc_header_present(ASSERTED const struct intel_device_info *devinfo,
brw_message_desc_header_present(ASSERTED
const struct intel_device_info *devinfo,
uint32_t desc)
{
assert(devinfo->ver >= 5);
......@@ -396,14 +398,16 @@ brw_sampler_desc(const struct intel_device_info *devinfo,
}
static inline unsigned
brw_sampler_desc_binding_table_index(UNUSED const struct intel_device_info *devinfo,
brw_sampler_desc_binding_table_index(UNUSED
const struct intel_device_info *devinfo,
uint32_t desc)
{
return GET_BITS(desc, 7, 0);
}
static inline unsigned
brw_sampler_desc_sampler(UNUSED const struct intel_device_info *devinfo, uint32_t desc)
brw_sampler_desc_sampler(UNUSED const struct intel_device_info *devinfo,
uint32_t desc)
{
return GET_BITS(desc, 11, 8);
}
......@@ -420,7 +424,8 @@ brw_sampler_desc_msg_type(const struct intel_device_info *devinfo, uint32_t desc
}
static inline unsigned
brw_sampler_desc_simd_mode(const struct intel_device_info *devinfo, uint32_t desc)
brw_sampler_desc_simd_mode(const struct intel_device_info *devinfo,
uint32_t desc)
{
assert(devinfo->ver >= 5);
if (devinfo->ver >= 7)
......@@ -518,7 +523,8 @@ brw_dp_read_desc(const struct intel_device_info *devinfo,
}
static inline unsigned
brw_dp_read_desc_msg_type(const struct intel_device_info *devinfo, uint32_t desc)
brw_dp_read_desc_msg_type(const struct intel_device_info *devinfo,
uint32_t desc)
{
if (devinfo->ver >= 6)
return brw_dp_desc_msg_type(devinfo, desc);
......
......@@ -2263,8 +2263,8 @@ uncompact_instruction(const struct compaction_state *c, brw_inst *dst,
}
void
brw_uncompact_instruction(const struct intel_device_info *devinfo, brw_inst *dst,
brw_compact_inst *src)
brw_uncompact_instruction(const struct intel_device_info *devinfo,
brw_inst *dst, brw_compact_inst *src)
{
struct compaction_state c;
compaction_state_init(&c, devinfo);
......
......@@ -104,7 +104,8 @@ inst_is_send(const struct intel_device_info *devinfo, const brw_inst *inst)
}
static bool
inst_is_split_send(const struct intel_device_info *devinfo, const brw_inst *inst)
inst_is_split_send(const struct intel_device_info *devinfo,
const brw_inst *inst)
{
if (devinfo->ver >= 12) {
return inst_is_send(devinfo, inst);
......@@ -198,7 +199,8 @@ src1_is_acc(const struct intel_device_info *devinfo, const brw_inst *inst)
}
static bool
src0_has_scalar_region(const struct intel_device_info *devinfo, const brw_inst *inst)
src0_has_scalar_region(const struct intel_device_info *devinfo,
const brw_inst *inst)
{
return brw_inst_src0_vstride(devinfo, inst) == BRW_VERTICAL_STRIDE_0 &&
brw_inst_src0_width(devinfo, inst) == BRW_WIDTH_1 &&
......@@ -206,7 +208,8 @@ src0_has_scalar_region(const struct intel_device_info *devinfo, const brw_inst *
}
static bool
src1_has_scalar_region(const struct intel_device_info *devinfo, const brw_inst *inst)
src1_has_scalar_region(const struct intel_device_info *devinfo,
const brw_inst *inst)
{
return brw_inst_src1_vstride(devinfo, inst) == BRW_VERTICAL_STRIDE_0 &&
brw_inst_src1_width(devinfo, inst) == BRW_WIDTH_1 &&
......
......@@ -597,7 +597,8 @@ namespace {
* found experimentally.
*/
bool
is_conflict_optimized_out(const intel_device_info *devinfo, const fs_inst *inst)
is_conflict_optimized_out(const intel_device_info *devinfo,
const fs_inst *inst)
{
return devinfo->ver >= 9 &&
((is_grf(inst->src[0]) && (reg_of(inst->src[0]) == reg_of(inst->src[1]) ||
......
......@@ -218,8 +218,8 @@ namespace {
* specified for the i-th source region.
*/
bool
has_invalid_src_modifiers(const intel_device_info *devinfo, const fs_inst *inst,
unsigned i)
has_invalid_src_modifiers(const intel_device_info *devinfo,
const fs_inst *inst, unsigned i)
{
return (!inst->can_do_source_mods(devinfo) &&
(inst->src[i].negate || inst->src[i].abs)) ||
......
......@@ -55,7 +55,7 @@ static inline void brw_inst_set_bits(brw_inst *inst,
#define FC(name, hi4, lo4, hi12, lo12, assertions) \
static inline void \
brw_inst_set_##name(const struct intel_device_info *devinfo, \
brw_inst_set_##name(const struct intel_device_info *devinfo, \
brw_inst *inst, uint64_t v) \
{ \
assert(assertions); \
......@@ -65,7 +65,7 @@ brw_inst_set_##name(const struct intel_device_info *devinfo, \
brw_inst_set_bits(inst, hi4, lo4, v); \
} \
static inline uint64_t \
brw_inst_##name(const struct intel_device_info *devinfo, \
brw_inst_##name(const struct intel_device_info *devinfo, \
const brw_inst *inst) \
{ \
assert(assertions); \
......@@ -107,7 +107,7 @@ brw_inst_##name(const struct intel_device_info *devinfo, \
#define FF(name, hi4, lo4, hi45, lo45, hi5, lo5, hi6, lo6, \
hi7, lo7, hi8, lo8, hi12, lo12) \
static inline void \
brw_inst_set_##name(const struct intel_device_info *devinfo, \
brw_inst_set_##name(const struct intel_device_info *devinfo, \
brw_inst *inst, uint64_t value) \
{ \
BOUNDS(hi4, lo4, hi45, lo45, hi5, lo5, hi6, lo6, \
......@@ -115,7 +115,7 @@ brw_inst_set_##name(const struct intel_device_info *devinfo,
brw_inst_set_bits(inst, high, low, value); \
} \
static inline uint64_t \
brw_inst_##name(const struct intel_device_info *devinfo, const brw_inst *inst) \
brw_inst_##name(const struct intel_device_info *devinfo, const brw_inst *inst)\
{ \
BOUNDS(hi4, lo4, hi45, lo45, hi5, lo5, hi6, lo6, \
hi7, lo7, hi8, lo8, hi12, lo12) \
......@@ -140,7 +140,7 @@ FF(name, \
#define FFDC(name, hi4, lo4, hi45, lo45, hi5, lo5, hi6, lo6, \
hi7, lo7, hi8, lo8, hi12ex, lo12ex, hi12, lo12, assertions) \
static inline void \
brw_inst_set_##name(const struct intel_device_info *devinfo, \
brw_inst_set_##name(const struct intel_device_info *devinfo, \
brw_inst *inst, uint64_t value) \
{ \
assert(assertions); \
......@@ -156,7 +156,7 @@ brw_inst_set_##name(const struct intel_device_info *devinfo,
} \
} \
static inline uint64_t \
brw_inst_##name(const struct intel_device_info *devinfo, const brw_inst *inst) \
brw_inst_##name(const struct intel_device_info *devinfo, const brw_inst *inst)\
{ \
assert(assertions); \
if (devinfo->ver >= 12) { \
......@@ -190,7 +190,7 @@ brw_inst_##name(const struct intel_device_info *devinfo, const brw_inst *inst)
*/
#define FI(name, hi4, lo4, hi8, lo8, hi12, lo12) \
static inline void \
brw_inst_set_##name(const struct intel_device_info *devinfo, \
brw_inst_set_##name(const struct intel_device_info *devinfo, \
brw_inst *inst, uint64_t value) \
{ \
if (devinfo->ver >= 12) { \
......@@ -204,7 +204,7 @@ brw_inst_set_##name(const struct intel_device_info *devinfo,
} \
} \
static inline uint64_t \
brw_inst_##name(const struct intel_device_info *devinfo, const brw_inst *inst) \
brw_inst_##name(const struct intel_device_info *devinfo, const brw_inst *inst)\
{ \
if (devinfo->ver >= 12) { \
return (brw_inst_bits(inst, hi12, hi12) << 1) | \
......@@ -222,7 +222,7 @@ brw_inst_##name(const struct intel_device_info *devinfo, const brw_inst *inst)
*/
#define FK(name, hi4, lo4, const12) \
static inline void \
brw_inst_set_##name(const struct intel_device_info *devinfo, \
brw_inst_set_##name(const struct intel_device_info *devinfo, \
brw_inst *inst, uint64_t v) \
{ \
if (devinfo->ver >= 12) \
......@@ -231,7 +231,7 @@ brw_inst_set_##name(const struct intel_device_info *devinfo, \
brw_inst_set_bits(inst, hi4, lo4, v); \
} \
static inline uint64_t \
brw_inst_##name(const struct intel_device_info *devinfo, \
brw_inst_##name(const struct intel_device_info *devinfo, \
const brw_inst *inst) \
{ \
if (devinfo->ver >= 12) \
......@@ -379,7 +379,7 @@ F(3src_hw_opcode, /* 4+ */ 6, 0, /* 12+ */ 6, 0)
#define REG_TYPE(reg) \
static inline void \
brw_inst_set_3src_a16_##reg##_type(const struct intel_device_info *devinfo, \
brw_inst_set_3src_a16_##reg##_type(const struct intel_device_info *devinfo, \
brw_inst *inst, enum brw_reg_type type) \
{ \
unsigned hw_type = brw_reg_type_to_a16_hw_3src_type(devinfo, type); \
......@@ -387,7 +387,7 @@ brw_inst_set_3src_a16_##reg##_type(const struct intel_device_info *devinfo,
} \
\
static inline enum brw_reg_type \
brw_inst_3src_a16_##reg##_type(const struct intel_device_info *devinfo, \
brw_inst_3src_a16_##reg##_type(const struct intel_device_info *devinfo, \
const brw_inst *inst) \
{ \
unsigned hw_type = brw_inst_3src_a16_##reg##_hw_type(devinfo, inst); \
......@@ -441,7 +441,7 @@ FC(3src_a1_exec_type, /* 4+ */ 35, 35, /* 12+ */ 39, 39, devinfo->ver
#define REG_TYPE(reg) \
static inline void \
brw_inst_set_3src_a1_##reg##_type(const struct intel_device_info *devinfo, \
brw_inst_set_3src_a1_##reg##_type(const struct intel_device_info *devinfo, \
brw_inst *inst, enum brw_reg_type type) \
{ \
UNUSED enum gfx10_align1_3src_exec_type exec_type = \
......@@ -457,7 +457,7 @@ brw_inst_set_3src_a1_##reg##_type(const struct intel_device_info *devinfo,
} \
\
static inline enum brw_reg_type \
brw_inst_3src_a1_##reg##_type(const struct intel_device_info *devinfo, \
brw_inst_3src_a1_##reg##_type(const struct intel_device_info *devinfo, \
const brw_inst *inst) \
{ \
enum gfx10_align1_3src_exec_type exec_type = \
......@@ -596,7 +596,7 @@ brw_inst_set_##name(const struct intel_device_info *devinfo, brw_inst *inst, int
brw_inst_set_bits(inst, high, low, (uint16_t) v); \
} \
static inline int16_t \
brw_inst_##name(const struct intel_device_info *devinfo, const brw_inst *inst) \
brw_inst_##name(const struct intel_device_info *devinfo, const brw_inst *inst)\
{ \
assert(assertions); \
(void) devinfo; \
......@@ -667,7 +667,8 @@ brw_inst_set_send_desc(const struct intel_device_info *devinfo,
* \sa brw_inst_set_send_desc().
*/
static inline uint32_t
brw_inst_send_desc(const struct intel_device_info *devinfo, const brw_inst *inst)
brw_inst_send_desc(const struct intel_device_info *devinfo,
const brw_inst *inst)
{
if (devinfo->ver >= 12) {
return (brw_inst_bits(inst, 123, 122) << 30 |
......@@ -1162,7 +1163,7 @@ brw_inst_set_imm_uq(const struct intel_device_info *devinfo,
#define REG_TYPE(reg) \
static inline void \
brw_inst_set_##reg##_file_type(const struct intel_device_info *devinfo, \
brw_inst_set_##reg##_file_type(const struct intel_device_info *devinfo, \
brw_inst *inst, enum brw_reg_file file, \
enum brw_reg_type type) \
{ \
......@@ -1173,7 +1174,7 @@ brw_inst_set_##reg##_file_type(const struct intel_device_info *devinfo,
} \
\
static inline enum brw_reg_type \
brw_inst_##reg##_type(const struct intel_device_info *devinfo, \
brw_inst_##reg##_type(const struct intel_device_info *devinfo, \
const brw_inst *inst) \
{ \
unsigned file = __builtin_strcmp("dst", #reg) == 0 ? \
......@@ -1193,7 +1194,8 @@ REG_TYPE(src1)
#define BRW_IA1_ADDR_IMM(reg, g4_high, g4_low, g8_nine, g8_high, g8_low, \
g12_high, g12_low) \
static inline void \
brw_inst_set_##reg##_ia1_addr_imm(const struct intel_device_info *devinfo, \
brw_inst_set_##reg##_ia1_addr_imm(const struct \
intel_device_info *devinfo, \
brw_inst *inst, \
unsigned value) \
{ \
......@@ -1208,7 +1210,7 @@ brw_inst_set_##reg##_ia1_addr_imm(const struct intel_device_info *devinfo, \
} \
} \
static inline unsigned \
brw_inst_##reg##_ia1_addr_imm(const struct intel_device_info *devinfo, \
brw_inst_##reg##_ia1_addr_imm(const struct intel_device_info *devinfo, \
const brw_inst *inst) \
{ \
if (devinfo->ver >= 12) { \
......@@ -1229,7 +1231,8 @@ BRW_IA1_ADDR_IMM(dst, 57, 48, 47, 56, 48, 59, 50)
#define BRW_IA16_ADDR_IMM(reg, g4_high, g4_low, g8_nine, g8_high, g8_low) \
static inline void \
brw_inst_set_##reg##_ia16_addr_imm(const struct intel_device_info *devinfo, \
brw_inst_set_##reg##_ia16_addr_imm(const struct \
intel_device_info *devinfo, \
brw_inst *inst, unsigned value) \
{ \
assert(devinfo->ver < 12); \
......@@ -1243,7 +1246,7 @@ brw_inst_set_##reg##_ia16_addr_imm(const struct intel_device_info *devinfo, \
} \
} \
static inline unsigned \
brw_inst_##reg##_ia16_addr_imm(const struct intel_device_info *devinfo, \
brw_inst_##reg##_ia16_addr_imm(const struct intel_device_info *devinfo, \
const brw_inst *inst) \
{ \
assert(devinfo->ver < 12); \
......@@ -1356,7 +1359,8 @@ brw_compact_inst_set_bits(brw_compact_inst *inst, unsigned high, unsigned low,
#define FC(name, high, low, gfx12_high, gfx12_low, assertions) \
static inline void \
brw_compact_inst_set_##name(const struct intel_device_info *devinfo, \
brw_compact_inst_set_##name(const struct \
intel_device_info *devinfo, \
brw_compact_inst *inst, unsigned v) \
{ \
assert(assertions); \
......@@ -1366,7 +1370,7 @@ brw_compact_inst_set_##name(const struct intel_device_info *devinfo, \
brw_compact_inst_set_bits(inst, high, low, v); \
} \
static inline unsigned \
brw_compact_inst_##name(const struct intel_device_info *devinfo, \
brw_compact_inst_##name(const struct intel_device_info *devinfo, \
const brw_compact_inst *inst) \
{ \
assert(assertions); \
......
......@@ -287,7 +287,8 @@ public:
bool is_send_from_grf() const;
unsigned size_read(unsigned arg) const;
bool can_reswizzle(const struct intel_device_info *devinfo, int dst_writemask,
bool can_reswizzle(const struct intel_device_info *devinfo,
int dst_writemask,
int swizzle, int swizzle_mask);
void reswizzle(int dst_writemask, int swizzle);
bool can_do_source_mods(const struct intel_device_info *devinfo);
......
......@@ -1468,7 +1468,8 @@ brw_aop_for_nir_intrinsic(const nir_intrinsic_instr *atomic)
}
enum brw_reg_type
brw_type_for_nir_type(const struct intel_device_info *devinfo, nir_alu_type type)
brw_type_for_nir_type(const struct intel_device_info *devinfo,
nir_alu_type type)
{
switch (type) {
case nir_type_uint:
......
......@@ -130,7 +130,8 @@ void brw_nir_rewrite_bindless_image_intrinsic(nir_intrinsic_instr *intrin,
nir_ssa_def *handle);
bool brw_nir_lower_mem_access_bit_sizes(nir_shader *shader,
const struct intel_device_info *devinfo);
const struct
intel_device_info *devinfo);
void brw_postprocess_nir(nir_shader *nir,
const struct brw_compiler *compiler,
......
......@@ -1245,7 +1245,8 @@ vec4_visitor::emit_urb_slot(dst_reg reg, int varying)
}
static unsigned
align_interleaved_urb_mlen(const struct intel_device_info *devinfo, unsigned mlen)
align_interleaved_urb_mlen(const struct intel_device_info *devinfo,
unsigned mlen)
{
if (devinfo->ver >= 6) {
/* URB data written (does not include the message header reg) must
......
......@@ -297,7 +297,7 @@ struct intel_device_info
static inline bool
intel_device_info_subslice_available(const struct intel_device_info *devinfo,
int slice, int subslice)
int slice, int subslice)
{
return (devinfo->subslice_masks[slice * devinfo->subslice_slice_stride +
subslice / 8] & (1U << (subslice % 8))) != 0;
......@@ -305,7 +305,7 @@ intel_device_info_subslice_available(const struct intel_device_info *devinfo,
static inline bool
intel_device_info_eu_available(const struct intel_device_info *devinfo,
int slice, int subslice, int eu)
int slice, int subslice, int eu)
{
unsigned subslice_offset = slice * devinfo->eu_slice_stride +
subslice * devinfo->eu_subslice_stride;
......@@ -336,7 +336,8 @@ intel_device_info_eu_total(const struct intel_device_info *devinfo)
}
static inline unsigned
intel_device_info_num_dual_subslices(UNUSED const struct intel_device_info *devinfo)
intel_device_info_num_dual_subslices(UNUSED
const struct intel_device_info *devinfo)
{
unreachable("TODO");
}
......@@ -346,7 +347,7 @@ const char *gen_get_device_name(int devid);
static inline uint64_t
intel_device_info_timebase_scale(const struct intel_device_info *devinfo,
uint64_t gpu_timestamp)
uint64_t gpu_timestamp)
{
return (1000000000ull * gpu_timestamp) / devinfo->timestamp_frequency;
}
......
......@@ -468,7 +468,8 @@ anv_format_has_npot_plane(const struct anv_format *anv_format) {
* _cannot_ check for compatibility).
*/
struct anv_format_plane
anv_get_format_plane(const struct intel_device_info *devinfo, VkFormat vk_format,
anv_get_format_plane(const struct intel_device_info *devinfo,
VkFormat vk_format,
VkImageAspectFlagBits aspect, VkImageTiling tiling)
{
const struct anv_format *format = anv_get_format(vk_format);
......
......@@ -3584,7 +3584,8 @@ anv_get_format_planes(VkFormat vk_format)
}
struct anv_format_plane
anv_get_format_plane(const struct intel_device_info *devinfo, VkFormat vk_format,
anv_get_format_plane(const struct intel_device_info *devinfo,
VkFormat vk_format,
VkImageAspectFlagBits aspect, VkImageTiling tiling);
static inline enum isl_format
......
......@@ -1995,7 +1995,8 @@ emit_3dstate_ps(struct anv_graphics_pipeline *pipeline,
const VkPipelineColorBlendStateCreateInfo *blend,
const VkPipelineMultisampleStateCreateInfo *multisample)
{
UNUSED const struct intel_device_info *devinfo = &pipeline->base.device->info;
UNUSED const struct intel_device_info *devinfo =
&pipeline->base.device->info;
const struct anv_shader_bin *fs_bin =
pipeline->shaders[MESA_SHADER_FRAGMENT];
......
......@@ -351,8 +351,8 @@ int brw_bo_busy(struct brw_bo *bo);
int brw_bo_madvise(struct brw_bo *bo, int madv);
/* drm_bacon_bufmgr_gem.c */
struct brw_bufmgr *brw_bufmgr_get_for_fd(struct intel_device_info *devinfo, int fd,
bool bo_reuse);
struct brw_bufmgr *brw_bufmgr_get_for_fd(struct intel_device_info *devinfo,
int fd, bool bo_reuse);
struct brw_bo *brw_bo_gem_create_from_name(struct brw_bufmgr *bufmgr,
const char *name,
......
......@@ -372,8 +372,8 @@ brw_delete_perf_query(struct gl_context *ctx,
}
/******************************************************************************/
/* intel_device_info will have incorrect default topology values for unsupported kernels.
* verify kernel support to ensure OA metrics are accurate.
/* intel_device_info will have incorrect default topology values for unsupported
* kernels. Verify kernel support to ensure OA metrics are accurate.
*/
static bool
oa_metrics_kernel_support(int fd, const struct intel_device_info *devinfo)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment