| Message ID | 20190430230606.8421-1-stuart.summers@intel.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Refactor to expand subslice mask | expand |
On Wed, 2019-05-01 at 00:58 +0000, Patchwork wrote: > == Series Details == > > Series: Refactor to expand subslice mask (rev6) > URL : https://patchwork.freedesktop.org/series/59742/ > State : failure I'm not sure what happened here, but my assumption is that CI didn't like the fact that I sent a single update to the series without the entire series. I sent a fully rebased series (as of this morning) to trybot and had no issues. So I went ahead and sent an updated series to this list to trigger CI and push for review. Sorry for the spam! -Stuart > > == Summary == > > Applying: drm/i915: Use local variable for SSEU info in GETPARAM > ioctl > Applying: drm/i915: Add macro for SSEU stride calculation > Applying: drm/i915: Move calculation of subslices per slice to new > function > Applying: drm/i915: Move sseu helper functions to intel_sseu.h > Applying: drm/i915: Remove inline from sseu helper functions > Applying: drm/i915: Expand subslice mask > error: sha1 information is lacking or useless > (drivers/gpu/drm/i915/i915_debugfs.c). > error: could not build fake ancestor > hint: Use 'git am --show-current-patch' to see the failed patch > Patch failed at 0006 drm/i915: Expand subslice mask > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am -- > abort". >
This patch series contains a few code clean-up patches, followed by a patch which changes the storage of the subslice mask to better match the userspace access through the I915_QUERY_TOPOLOGY_INFO ioctl. The index into the subslice_mask array is then calculated: slice * subslice stride + subslice index / 8 v2: fix i915_pm_sseu test failure v3: no changes to patches in the series, just resending to pick up in CI correctly v4: rebase v5: fix header test v6: address review comments from Jari address minor checkpatch warning in existing code use eu_stride for EU div-by-8 Stuart Summers (6): drm/i915: Use local variable for SSEU info in GETPARAM ioctl drm/i915: Add macro for SSEU stride calculation drm/i915: Move calculation of subslices per slice to new function drm/i915: Move sseu helper functions to intel_sseu.h drm/i915: Remove inline from sseu helper functions drm/i915: Expand subslice mask drivers/gpu/drm/i915/gt/intel_engine_cs.c | 6 +- drivers/gpu/drm/i915/gt/intel_engine_types.h | 32 +-- drivers/gpu/drm/i915/gt/intel_hangcheck.c | 3 +- drivers/gpu/drm/i915/gt/intel_sseu.c | 85 ++++++++ drivers/gpu/drm/i915/gt/intel_sseu.h | 30 ++- drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 50 +++-- drivers/gpu/drm/i915/i915_drv.c | 15 +- drivers/gpu/drm/i915/i915_gpu_error.c | 5 +- drivers/gpu/drm/i915/i915_query.c | 15 +- drivers/gpu/drm/i915/intel_device_info.c | 209 +++++++++++-------- drivers/gpu/drm/i915/intel_device_info.h | 47 ----- 12 files changed, 302 insertions(+), 197 deletions(-)