UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Add function to set subslices 

Add a new function to set a set of subslices for a given
slice.

v2: Fix typo in subslice_mask assignment

Signed-off-by: Stuart Summers <stuart.summers@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190823160307.180813-7-stuart.summers@intel.com
This commit is contained in:
Stuart Summers 2019-08-23 09:03:02 -07:00 committed by Chris Wilson
parent 33ee9e8680
commit 9e8a135ed5
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/i915/gt/intel_sseu.c
View File

@ -32,6 +32,12 @@ intel_sseu_subslice_total(const struct sseu_dev_info *sseu)
return total; return total;
} }
void intel_sseu_set_subslices(struct sseu_dev_info *sseu, int slice,
u8 ss_mask)
{
sseu->subslice_mask[slice] = ss_mask;
}
unsigned int unsigned int
intel_sseu_subslices_per_slice(const struct sseu_dev_info *sseu, u8 slice) intel_sseu_subslices_per_slice(const struct sseu_dev_info *sseu, u8 slice)
{ {

3
drivers/gpu/drm/i915/gt/intel_sseu.h
View File

@ -78,6 +78,9 @@ intel_sseu_subslice_total(const struct sseu_dev_info *sseu);
unsigned int unsigned int
intel_sseu_subslices_per_slice(const struct sseu_dev_info *sseu, u8 slice); intel_sseu_subslices_per_slice(const struct sseu_dev_info *sseu, u8 slice);
void intel_sseu_set_subslices(struct sseu_dev_info *sseu, int slice,
u8 ss_mask);
u32 intel_sseu_make_rpcs(struct drm_i915_private *i915, u32 intel_sseu_make_rpcs(struct drm_i915_private *i915,
const struct intel_sseu *req_sseu); const struct intel_sseu *req_sseu);

18
drivers/gpu/drm/i915/intel_device_info.c
View File

@ -206,7 +206,10 @@ static void gen11_sseu_info_init(struct drm_i915_private *dev_priv)
int ss; int ss;
sseu->slice_mask |= BIT(s); sseu->slice_mask |= BIT(s);
sseu->subslice_mask[s] = (ss_en >> ss_idx) & ss_en_mask;
intel_sseu_set_subslices(sseu, s, (ss_en >> ss_idx) &
ss_en_mask);
for (ss = 0; ss < sseu->max_subslices; ss++) { for (ss = 0; ss < sseu->max_subslices; ss++) {
if (sseu->subslice_mask[s] & BIT(ss)) if (sseu->subslice_mask[s] & BIT(ss))
sseu_set_eus(sseu, s, ss, eu_en); sseu_set_eus(sseu, s, ss, eu_en);
@ -274,8 +277,9 @@ static void gen10_sseu_info_init(struct drm_i915_private *dev_priv)
* Slice0 can have up to 3 subslices, but there are only 2 in * Slice0 can have up to 3 subslices, but there are only 2 in
* slice1/2. * slice1/2.
*/ */
sseu->subslice_mask[s] = s == 0 ? subslice_mask_with_eus : intel_sseu_set_subslices(sseu, s, s == 0 ?
subslice_mask_with_eus & 0x3; subslice_mask_with_eus :
subslice_mask_with_eus & 0x3);
} }
sseu->eu_total = compute_eu_total(sseu); sseu->eu_total = compute_eu_total(sseu);
@ -330,7 +334,7 @@ static void cherryview_sseu_info_init(struct drm_i915_private *dev_priv)
sseu_set_eus(sseu, 0, 1, ~disabled_mask); sseu_set_eus(sseu, 0, 1, ~disabled_mask);
} }
sseu->subslice_mask[0] = subslice_mask; intel_sseu_set_subslices(sseu, 0, subslice_mask);
sseu->eu_total = compute_eu_total(sseu); sseu->eu_total = compute_eu_total(sseu);
@ -384,7 +388,7 @@ static void gen9_sseu_info_init(struct drm_i915_private *dev_priv)
/* skip disabled slice */ /* skip disabled slice */
continue; continue;
sseu->subslice_mask[s] = subslice_mask; intel_sseu_set_subslices(sseu, s, subslice_mask);
eu_disable = I915_READ(GEN9_EU_DISABLE(s)); eu_disable = I915_READ(GEN9_EU_DISABLE(s));
for (ss = 0; ss < sseu->max_subslices; ss++) { for (ss = 0; ss < sseu->max_subslices; ss++) {
@ -491,7 +495,7 @@ static void broadwell_sseu_info_init(struct drm_i915_private *dev_priv)
/* skip disabled slice */ /* skip disabled slice */
continue; continue;
sseu->subslice_mask[s] = subslice_mask; intel_sseu_set_subslices(sseu, s, subslice_mask);
for (ss = 0; ss < sseu->max_subslices; ss++) { for (ss = 0; ss < sseu->max_subslices; ss++) {
u8 eu_disabled_mask; u8 eu_disabled_mask;
@ -588,7 +592,7 @@ static void haswell_sseu_info_init(struct drm_i915_private *dev_priv)
sseu->eu_per_subslice); sseu->eu_per_subslice);
for (s = 0; s < sseu->max_slices; s++) { for (s = 0; s < sseu->max_slices; s++) {
sseu->subslice_mask[s] = subslice_mask; intel_sseu_set_subslices(sseu, s, subslice_mask);
for (ss = 0; ss < sseu->max_subslices; ss++) { for (ss = 0; ss < sseu->max_subslices; ss++) {
sseu_set_eus(sseu, s, ss, sseu_set_eus(sseu, s, ss,