| Message ID | 20170216063639.GA17107@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Feb 16, 2017 at 02:36:40PM +0800, Chuanxiao Dong wrote: > When not using GuC submission, the ring buffer size for GVT context is > 512KB which is the max size. When switching to GuC submission, the ring > buffer size is required to be less than 16KB. So use the GVT context > default ring buffer size if GuC submission is enabled. > > Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.com> Other than grimacing over seeing another i915.enable_guc_submission outside of the guc setup code, Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> -Chris
On Thu, Feb 16, 2017 at 07:35:59AM +0000, Chris Wilson wrote: > On Thu, Feb 16, 2017 at 02:36:40PM +0800, Chuanxiao Dong wrote: > > When not using GuC submission, the ring buffer size for GVT context is > > 512KB which is the max size. When switching to GuC submission, the ring > > buffer size is required to be less than 16KB. So use the GVT context > > default ring buffer size if GuC submission is enabled. > > > > Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.com> > > Other than grimacing over seeing another i915.enable_guc_submission > outside of the guc setup code, > > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Applied, thanks. -Chris
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index c73bf02..26f0b65 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -431,7 +431,8 @@ i915_gem_context_create_gvt(struct drm_device *dev) i915_gem_context_set_closed(ctx); /* not user accessible */ i915_gem_context_clear_bannable(ctx); i915_gem_context_set_force_single_submission(ctx); - ctx->ring_size = 512 * PAGE_SIZE; /* Max ring buffer size */ + if (!i915.enable_guc_submission) + ctx->ring_size = 512 * PAGE_SIZE; /* Max ring buffer size */ GEM_BUG_ON(i915_gem_context_is_kernel(ctx)); out:
When not using GuC submission, the ring buffer size for GVT context is 512KB which is the max size. When switching to GuC submission, the ring buffer size is required to be less than 16KB. So use the GVT context default ring buffer size if GuC submission is enabled. Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.com> --- drivers/gpu/drm/i915/i915_gem_context.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)