KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel: Get information about pixel pipes subslices. 

v2: Use 1 instead of 1UL (Ken).
This commit is contained in:
Rafael Antognolli 2019-07-01 13:34:08 -07:00
parent 32344dc581
commit ad513fd386
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/intel/dev/gen_device_info.c
View File

@ -1073,6 +1073,7 @@ reset_masks(struct gen_device_info *devinfo)
memset(&devinfo->slice_masks, 0, sizeof(devinfo->slice_masks));
memset(devinfo->subslice_masks, 0, sizeof(devinfo->subslice_masks));
memset(devinfo->eu_masks, 0, sizeof(devinfo->eu_masks));
memset(devinfo->ppipe_subslices, 0, sizeof(devinfo->ppipe_subslices));
}
static void
@ -1098,7 +1099,7 @@ update_from_topology(struct gen_device_info *devinfo,
uint32_t n_subslices = 0;
for (int s = 0; s < topology->max_slices; s++) {
if ((devinfo->slice_masks & (1UL << s)) == 0)
if ((devinfo->slice_masks & (1 << s)) == 0)
continue;
for (int b = 0; b < devinfo->subslice_slice_stride; b++) {
@ -1109,6 +1110,23 @@ update_from_topology(struct gen_device_info *devinfo,
}
assert(n_subslices > 0);
if (devinfo->gen == 11) {
/* On ICL we only have one slice */
assert(devinfo->slice_masks == 1);
/* Count the number of subslices on each pixel pipe. Assume that
* subslices 0-3 are on pixel pipe 0, and 4-7 are on pixel pipe 1.
*/
unsigned subslices = devinfo->subslice_masks[0];
unsigned ss = 0;
while (subslices > 0) {
if (subslices & 1)
devinfo->ppipe_subslices[ss >= 4 ? 1 : 0] += 1;
subslices >>= 1;
ss++;
}
}
uint32_t eu_mask_len =
topology->eu_stride * topology->max_subslices * topology->max_slices;
assert(sizeof(devinfo->eu_masks) >= eu_mask_len);

6
src/intel/dev/gen_device_info.h
View File

@ -39,6 +39,7 @@ struct drm_i915_query_topology_info;
#define GEN_DEVICE_MAX_SLICES (6) /* Maximum on gen10 */
#define GEN_DEVICE_MAX_SUBSLICES (8) /* Maximum on gen11 */
#define GEN_DEVICE_MAX_EUS_PER_SUBSLICE (10) /* Maximum on Haswell */
#define GEN_DEVICE_MAX_PIXEL_PIPES (2) /* Maximum on gen11 */
/**
* Intel hardware information and quirks
@ -124,6 +125,11 @@ struct gen_device_info
*/
unsigned num_subslices[GEN_DEVICE_MAX_SUBSLICES];
/**
* Number of subslices on each pixel pipe (ICL).
*/
unsigned ppipe_subslices[GEN_DEVICE_MAX_PIXEL_PIPES];
/**
* Upper bound of number of EU per subslice (some SKUs might have just 1 EU
* fused across all subslices, like 47 EUs, in which case this number won't