| Message ID | 20190828210209.10541-1-rodrigo.vivi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: fix broadwell EU computation | expand |
On 29/08/2019 00:02, Rodrigo Vivi wrote: > From: Lionel Landwerlin <lionel.g.landwerlin@intel.com> > > commit 6a67a20366f894c172734f28c5646bdbe48a46e3 upstream. > > subslice_mask is an array indexed by slice, not subslice. > > Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> > Fixes: 8cc7669355136f ("drm/i915: store all subslice masks") > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108712 > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> > Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > Link: https://patchwork.freedesktop.org/patch/msgid/20181112123931.2815-1-lionel.g.landwerlin@intel.com > (cherry picked from commit 63ac3328f0d1d37f286e397b14d9596ed09d7ca5) > Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: <stable@vger.kernel.org> # 4.17 Rodrigo pointed out I forgot the Cc: tag which is why this didn't make it to stable. The same bug showed up on a CentOS kernel : https://github.com/intel/compute-runtime/issues/200 My bad... :( Thanks for resending! -Lionel > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > --- > drivers/gpu/drm/i915/intel_device_info.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c > index 0ef0c6448d53..01fa98299bae 100644 > --- a/drivers/gpu/drm/i915/intel_device_info.c > +++ b/drivers/gpu/drm/i915/intel_device_info.c > @@ -474,7 +474,7 @@ static void broadwell_sseu_info_init(struct drm_i915_private *dev_priv) > u8 eu_disabled_mask; > u32 n_disabled; > > - if (!(sseu->subslice_mask[ss] & BIT(ss))) > + if (!(sseu->subslice_mask[s] & BIT(ss))) > /* skip disabled subslice */ > continue; >
On Thu, Aug 29, 2019 at 12:22:27AM +0300, Lionel Landwerlin wrote: >On 29/08/2019 00:02, Rodrigo Vivi wrote: >>From: Lionel Landwerlin <lionel.g.landwerlin@intel.com> >> >>commit 6a67a20366f894c172734f28c5646bdbe48a46e3 upstream. >> >>subslice_mask is an array indexed by slice, not subslice. >> >>Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> >>Fixes: 8cc7669355136f ("drm/i915: store all subslice masks") >>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108712 >>Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> >>Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> >>Link: https://patchwork.freedesktop.org/patch/msgid/20181112123931.2815-1-lionel.g.landwerlin@intel.com >>(cherry picked from commit 63ac3328f0d1d37f286e397b14d9596ed09d7ca5) >>Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> >>Cc: <stable@vger.kernel.org> # 4.17 > > >Rodrigo pointed out I forgot the Cc: tag which is why this didn't make >it to stable. > >The same bug showed up on a CentOS kernel : >https://github.com/intel/compute-runtime/issues/200 I just queued the upstream patch for 4.19, thanks! -- Thanks, Sasha
diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c index 0ef0c6448d53..01fa98299bae 100644 --- a/drivers/gpu/drm/i915/intel_device_info.c +++ b/drivers/gpu/drm/i915/intel_device_info.c @@ -474,7 +474,7 @@ static void broadwell_sseu_info_init(struct drm_i915_private *dev_priv) u8 eu_disabled_mask; u32 n_disabled; - if (!(sseu->subslice_mask[ss] & BIT(ss))) + if (!(sseu->subslice_mask[s] & BIT(ss))) /* skip disabled subslice */ continue;