diff options
| author | Imre Deak | 2016-08-31 18:13:04 +0200 |
|---|---|---|
| committer | Imre Deak | 2016-09-02 17:17:14 +0200 |
| commit | f08a0c9234c86cf0249a5edd58a7abf69617f29f (patch) | |
| tree | ee6f1b4c55b5653edaee5f1031d03c11fb64026e /drivers/gpu/drm/i915/intel_lrc.c | |
| parent | drm/i915: sseu: Simplify debugfs status/info printing (diff) | |
| download | kernel-qcow2-linux-f08a0c9234c86cf0249a5edd58a7abf69617f29f.tar.gz kernel-qcow2-linux-f08a0c9234c86cf0249a5edd58a7abf69617f29f.tar.xz kernel-qcow2-linux-f08a0c9234c86cf0249a5edd58a7abf69617f29f.zip | |
drm/i915: sseu: Convert slice count field to mask
In an upcoming patch we'll need the actual mask of slices in addition to
their count, so replace the count field with a mask.
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>
Link: http://patchwork.freedesktop.org/patch/msgid/1472659987-10417-5-git-send-email-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 3b076e2bffd4..7209553ab162 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1898,7 +1898,7 @@ make_rpcs(struct drm_i915_private *dev_priv) */ if (INTEL_INFO(dev_priv)->sseu.has_slice_pg) { rpcs |= GEN8_RPCS_S_CNT_ENABLE; - rpcs |= INTEL_INFO(dev_priv)->sseu.slice_total << + rpcs |= hweight8(INTEL_INFO(dev_priv)->sseu.slice_mask) << GEN8_RPCS_S_CNT_SHIFT; rpcs |= GEN8_RPCS_ENABLE; } |