diff options
| author | Imre Deak <imre.deak@intel.com> | 2016-08-31 19:13:05 +0300 |
|---|---|---|
| committer | Imre Deak <imre.deak@intel.com> | 2016-09-02 18:17:47 +0300 |
| commit | 57ec171eae21ee0a2848ade1cb7f8f12a31b0731 (patch) | |
| tree | 45b5084e47a82c27286a3b3e9473d6b3fb463ea1 /drivers/gpu/drm/i915/intel_lrc.c | |
| parent | f08a0c9234c86cf0249a5edd58a7abf69617f29f (diff) | |
| download | talos-op-linux-57ec171eae21ee0a2848ade1cb7f8f12a31b0731.tar.gz talos-op-linux-57ec171eae21ee0a2848ade1cb7f8f12a31b0731.zip | |
drm/i915: sseu: Convert subslice count fields to subslice mask
In an upcoming patch we'll need the actual mask of subslices in addition
to their count, so convert the subslice_per_slice field to a mask.
Also we can easily calculate subslice_total from the other fields, so
instead of storing a cached version of this, add a helper to calculate
it.
v2:
- Use hweight8() on u8 typed vars instead of hweight32(). (Ben)
Reviewed-by: Robert Bragg <robert@sixbynine.org> (v1)
Reviewed-by: Ben Widawsky <benjamin.widawsky@intel.com> (v1)
Tested-by: Ben Widawsky <benjamin.widawsky@intel.com> (v1)
Signed-off-by: Imre Deak <imre.deak@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lrc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 7209553ab162..92bfe47ad33c 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1905,7 +1905,7 @@ make_rpcs(struct drm_i915_private *dev_priv) if (INTEL_INFO(dev_priv)->sseu.has_subslice_pg) { rpcs |= GEN8_RPCS_SS_CNT_ENABLE; - rpcs |= INTEL_INFO(dev_priv)->sseu.subslice_per_slice << + rpcs |= hweight8(INTEL_INFO(dev_priv)->sseu.subslice_mask) << GEN8_RPCS_SS_CNT_SHIFT; rpcs |= GEN8_RPCS_ENABLE; } |
