Set subslice mask according to the per-context sseu value. #271

zxye · 2018-08-13T01:52:57Z

This will shut down the non-VME subslice on ICLLP when VME is used.
Fixes issue #267.

zxye · 2018-09-27T02:27:21Z

This PR requires the slice shutdown i915 uAPI supported by this branch https://cgit.freedesktop.org/~tursulin/drm-intel/log/?h=sseu

zxye · 2018-10-10T08:53:28Z

This PR works with this i915 branch: https://cgit.freedesktop.org/~tursulin/drm-intel/log/?h=media

smrowe4 · 2018-10-18T20:30:54Z

I tried this commit along with https://cgit.freedesktop.org/~tursulin/drm-intel/log/?h=media. Works for AVC VME encode. Can this commit be upstreamed?

zxye · 2018-10-29T08:23:54Z

I tried this commit along with https://cgit.freedesktop.org/~tursulin/drm-intel/log/?h=media. Works for AVC VME encode. Can this commit be upstreamed?

Will upstream the commit after KMD patch is upstreamed.

ykku16github · 2018-10-30T02:01:24Z

FYI. In https://cgit.freedesktop.org/~tursulin/drm-intel/tree/include/uapi/drm/i915_drm.h?h=media, I915_CONTEXT_PARAM_SSEU is defined to be 0x8. But in https://patchwork.freedesktop.org/series/48194/ (rev 6), it has been changed to 0x7.

@zxye, your patch may need an update depending on which one gets merged in kernel space.

zxye · 2018-12-11T03:18:04Z

FYI. In https://cgit.freedesktop.org/~tursulin/drm-intel/tree/include/uapi/drm/i915_drm.h?h=media, I915_CONTEXT_PARAM_SSEU is defined to be 0x8. But in https://patchwork.freedesktop.org/series/48194/ (rev 6), it has been changed to 0x7.

@zxye, your patch may need an update depending on which one gets merged in kernel space.

Yes, currently this PR uses the number from https://cgit.freedesktop.org/~tursulin/drm-intel/log/?h=media header file. Once the i915 patches are upstreamed, I will update the PR to align with it before merging the PR into master branch. Thanks.

media_driver/linux/common/os/i915/include/uapi/i915_drm.h

media_driver/linux/common/os/i915/include/mos_bufmgr.h

dvrogozh · 2019-01-14T18:14:59Z

Please, rebase to fix conflict.

dvrogozh · 2019-01-30T19:45:01Z

media_driver/linux/common/os/i915/include/uapi/i915_drm.h

@@ -1069,8 +1069,17 @@ struct drm_i915_gem_execbuffer2 {
 * dma fences to wait upon or signal.
 */
 #define I915_EXEC_FENCE_ARRAY   (1<<19)
+/*


This commit should be substituted with the official pull of the updated i915 uAPI (once it will land to drm-next) according to the instruction: https://github.com/intel/media-driver/blob/master/media_driver/linux/common/os/i915/include/uapi/README.

I can update the PR with "$ make headers_install INSTALL_HDR_PATH=/path/to/install" once the uAPI changes landed drm-next.

dvrogozh · 2019-01-30T19:46:52Z

media_driver/linux/common/os/i915/mos_bufmgr.c

+}
+
+int
+mos_get_subslice_mask(int fd, unsigned int *subslice_mask)


I don't see you use this function. Do we really need it? Why?

This was used at the beginning and then removed later. But it is a thin wrapper of the uAPI, maybe it can be useful in the future.

I don't see the point to keep the code which we don't exercise. This will give us a burden to support. I would drop.

dvrogozh · 2019-01-30T19:47:22Z

media_driver/linux/common/os/i915/mos_bufmgr.c

+}
+
+int
+mos_get_slice_mask(int fd, unsigned int *slice_mask)


Same. This function also looks unused.

At the beginning, this PR included the changes to upgrade the SKL slice shutdown with this upstream SSEU uAPI. This function was used for that purpose. If we do not need SKL slice shutdown anymore on master branch, it can be removed. Again, it's also a thin wrapper of the uAPI and could be useful in the future.

I don't see the point to keep the code which we don't exercise. This will give us a burden to support. I would drop.

And if it is needed by someone - let him bring the whole bunch of code to support SKL slice shutdown rather than few functions for it.

dvrogozh · 2019-02-12T03:15:05Z

@zxye : I believe SSEU patch series landed upstream and in drm-next. Can you, please, update this PR w/ update 915 uAPI per instruction here: https://github.com/intel/media-driver/blob/master/media_driver/linux/common/os/i915/include/uapi/README? I belive we need to proceed with merging this in.

zxye · 2019-02-13T09:08:28Z

@dvrogozh @XinfengZhang I synced the i915 header with drm_next and rebased the PR to latest master. Please help review and merge if no issue. Thank you.

XinfengZhang · 2019-02-14T03:30:09Z

@hanlong1 , test for this PR should also upgrade kernel

dvrogozh

Please, strictly follow instruction here (if not): https://github.com/intel/media-driver/blob/master/media_driver/linux/common/os/i915/include/uapi/README. Once done, update README and list commit which you've picked in drm-next.

dvrogozh · 2019-02-14T14:46:20Z

media_driver/linux/common/os/i915/mos_bufmgr.c

+}
+
+int
+mos_get_subslice_mask(int fd, unsigned int *subslice_mask)


I don't see the point to keep the code which we don't exercise. This will give us a burden to support. I would drop.

dvrogozh · 2019-02-14T14:47:43Z

media_driver/linux/common/os/i915/mos_bufmgr.c

+}
+
+int
+mos_get_slice_mask(int fd, unsigned int *slice_mask)


I don't see the point to keep the code which we don't exercise. This will give us a burden to support. I would drop.

And if it is needed by someone - let him bring the whole bunch of code to support SKL slice shutdown rather than few functions for it.

dvrogozh · 2019-02-21T04:08:32Z

@zxye : I see the change 39ce64a which looks to be this PR. Why we did not merge in #271 and got some change thru other channel?

…92914ac863884f308766 to include the SSEU uAPI.

…l#267.

zxye force-pushed the sseu branch from 74a75f0 to 9c0a28e Compare August 13, 2018 02:06

zxye mentioned this pull request Aug 13, 2018

[ICLLP][AVC Encode] AVC encode triggers GPU hang on ICLLP #267

Closed

zxye force-pushed the sseu branch from 9c0a28e to fc0f927 Compare August 30, 2018 04:11

zxye force-pushed the sseu branch 2 times, most recently from 2d5489b to ad900e8 Compare September 21, 2018 10:16

zxye force-pushed the sseu branch from ad900e8 to bc1c760 Compare October 10, 2018 04:34

zxye force-pushed the sseu branch from bc1c760 to d3a6526 Compare October 19, 2018 05:08

zxye force-pushed the sseu branch from d3a6526 to e487f63 Compare December 11, 2018 02:35

zxye changed the title ~~Set SSEU configuration according to the per-context createOption.~~ Set subslice mask according to the per-context sseu value. Dec 11, 2018

dvrogozh suggested changes Dec 15, 2018

View reviewed changes

media_driver/linux/common/os/i915/include/uapi/i915_drm.h Outdated Show resolved Hide resolved

media_driver/linux/common/os/i915/include/mos_bufmgr.h Outdated Show resolved Hide resolved

zxye closed this Dec 25, 2018

zxye force-pushed the sseu branch from e487f63 to 9b84413 Compare December 25, 2018 08:51

zxye reopened this Dec 25, 2018

zxye closed this Jan 22, 2019

zxye force-pushed the sseu branch from 796341b to 1e217c7 Compare January 22, 2019 02:30

zxye reopened this Jan 22, 2019

dvrogozh suggested changes Jan 30, 2019

View reviewed changes

zxye closed this Jan 31, 2019

zxye force-pushed the sseu branch from 5764aea to 1e217c7 Compare January 31, 2019 08:38

zxye reopened this Jan 31, 2019

zxye force-pushed the sseu branch from adca3c4 to 29ab3a5 Compare February 13, 2019 09:04

XinfengZhang added the verifying PR: fix ready and verifying with build/test label Feb 14, 2019

dvrogozh suggested changes Feb 14, 2019

View reviewed changes

zxye force-pushed the sseu branch from 29ab3a5 to 132c37d Compare February 14, 2019 05:37

dvrogozh approved these changes Feb 14, 2019

View reviewed changes

zxye force-pushed the sseu branch from 132c37d to c0c34bf Compare February 25, 2019 13:27

zxye added 2 commits February 26, 2019 05:05

Synced i915 header i915_drm.h to drm-next commit 16065fcdd19ddb9e0931…

9090058

…92914ac863884f308766 to include the SSEU uAPI.

Set subslice mask according to the per-context sseu value. Fixes inte…

c0c34bf

…l#267.

Sherry-Lin approved these changes Feb 26, 2019

View reviewed changes

Sherry-Lin merged commit 5027716 into intel:master Feb 26, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Set subslice mask according to the per-context sseu value. #271

Set subslice mask according to the per-context sseu value. #271

zxye commented Aug 13, 2018 •

edited

Loading

zxye commented Sep 27, 2018

zxye commented Oct 10, 2018

smrowe4 commented Oct 18, 2018

zxye commented Oct 29, 2018

ykku16github commented Oct 30, 2018

zxye commented Dec 11, 2018

dvrogozh commented Jan 14, 2019

dvrogozh Jan 30, 2019

zxye Jan 31, 2019

dvrogozh Jan 30, 2019

zxye Jan 31, 2019

dvrogozh Feb 14, 2019

dvrogozh Jan 30, 2019

zxye Jan 31, 2019

dvrogozh Feb 14, 2019

dvrogozh commented Feb 12, 2019

zxye commented Feb 13, 2019

XinfengZhang commented Feb 14, 2019

dvrogozh left a comment

dvrogozh Feb 14, 2019

dvrogozh Feb 14, 2019

dvrogozh commented Feb 21, 2019

Set subslice mask according to the per-context sseu value. #271

Set subslice mask according to the per-context sseu value. #271

Conversation

zxye commented Aug 13, 2018 • edited Loading

zxye commented Sep 27, 2018

zxye commented Oct 10, 2018

smrowe4 commented Oct 18, 2018

zxye commented Oct 29, 2018

ykku16github commented Oct 30, 2018

zxye commented Dec 11, 2018

dvrogozh commented Jan 14, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dvrogozh commented Feb 12, 2019

zxye commented Feb 13, 2019

XinfengZhang commented Feb 14, 2019

dvrogozh left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dvrogozh commented Feb 21, 2019

zxye commented Aug 13, 2018 •

edited

Loading