| Message ID | 20210728192100.132425-1-matthew.brost@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Disable bonding on gen12+ platforms | expand |
On 7/28/2021 12:21, Matthew Brost wrote: > Disable bonding on gen12+ platforms aside from ones already supported by > the i915 - TGL, RKL, and ADL-S. > > Signed-off-by: Matthew Brost <matthew.brost@intel.com> > --- > drivers/gpu/drm/i915/gem/i915_gem_context.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c > index 05c3ee191710..9c3672bac0e2 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c > @@ -446,6 +446,13 @@ set_proto_ctx_engines_bond(struct i915_user_extension __user *base, void *data) > u16 idx, num_bonds; > int err, n; > > + if (GRAPHICS_VER(i915) >= 12 && !IS_TIGERLAKE(i915) && > + !IS_ROCKETLAKE(i915) && !IS_ALDERLAKE_S(i915)) { > + drm_dbg(&i915->drm, > + "Bonding on gen12+ aside from TGL, RKL, and ADL_S not allowed\n"); I would have said not supported rather than not allowed. Either way: Reviewed-by: John Harrison <John.C.Harrison@Intel.com> > + return -ENODEV; > + } > + > if (get_user(idx, &ext->virtual_index)) > return -EFAULT; >
On Fri, Aug 6, 2021 at 8:25 PM John Harrison <john.c.harrison@intel.com> wrote: > On 7/28/2021 12:21, Matthew Brost wrote: > > Disable bonding on gen12+ platforms aside from ones already supported by > > the i915 - TGL, RKL, and ADL-S. > > > > Signed-off-by: Matthew Brost <matthew.brost@intel.com> > > --- > > drivers/gpu/drm/i915/gem/i915_gem_context.c | 7 +++++++ > > 1 file changed, 7 insertions(+) > > > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c > > index 05c3ee191710..9c3672bac0e2 100644 > > --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c > > +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c > > @@ -446,6 +446,13 @@ set_proto_ctx_engines_bond(struct i915_user_extension __user *base, void *data) > > u16 idx, num_bonds; > > int err, n; > > > > + if (GRAPHICS_VER(i915) >= 12 && !IS_TIGERLAKE(i915) && > > + !IS_ROCKETLAKE(i915) && !IS_ALDERLAKE_S(i915)) { > > + drm_dbg(&i915->drm, > > + "Bonding on gen12+ aside from TGL, RKL, and ADL_S not allowed\n"); > I would have said not supported rather than not allowed. Either way: > Reviewed-by: John Harrison <John.C.Harrison@Intel.com> Either is fine with me. Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > > + return -ENODEV; > > + } > > + > > if (get_user(idx, &ext->virtual_index)) > > return -EFAULT; > > >
On Fri, Aug 06, 2021 at 08:54:59PM +0200, Daniel Vetter wrote: > On Fri, Aug 6, 2021 at 8:25 PM John Harrison <john.c.harrison@intel.com> wrote: > > On 7/28/2021 12:21, Matthew Brost wrote: > > > Disable bonding on gen12+ platforms aside from ones already supported by > > > the i915 - TGL, RKL, and ADL-S. > > > > > > Signed-off-by: Matthew Brost <matthew.brost@intel.com> > > > --- > > > drivers/gpu/drm/i915/gem/i915_gem_context.c | 7 +++++++ > > > 1 file changed, 7 insertions(+) > > > > > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c > > > index 05c3ee191710..9c3672bac0e2 100644 > > > --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c > > > +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c > > > @@ -446,6 +446,13 @@ set_proto_ctx_engines_bond(struct i915_user_extension __user *base, void *data) > > > u16 idx, num_bonds; > > > int err, n; > > > > > > + if (GRAPHICS_VER(i915) >= 12 && !IS_TIGERLAKE(i915) && > > > + !IS_ROCKETLAKE(i915) && !IS_ALDERLAKE_S(i915)) { > > > + drm_dbg(&i915->drm, > > > + "Bonding on gen12+ aside from TGL, RKL, and ADL_S not allowed\n"); > > I would have said not supported rather than not allowed. Either way: > > Reviewed-by: John Harrison <John.C.Harrison@Intel.com> > > Either is fine with me. > > Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > Applied to drm-intel-gt-next (with the suggested debug message wording tweak). Thanks for the patch and reviews. Matt > > > > > + return -ENODEV; > > > + } > > > + > > > if (get_user(idx, &ext->virtual_index)) > > > return -EFAULT; > > > > > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch
On 07/08/2021 06:02, Matt Roper wrote: > On Fri, Aug 06, 2021 at 08:54:59PM +0200, Daniel Vetter wrote: >> On Fri, Aug 6, 2021 at 8:25 PM John Harrison <john.c.harrison@intel.com> wrote: >>> On 7/28/2021 12:21, Matthew Brost wrote: >>>> Disable bonding on gen12+ platforms aside from ones already supported by >>>> the i915 - TGL, RKL, and ADL-S. Does this needs adjusting for the change in ADL-P plans? Regards, Tvrtko >>>> >>>> Signed-off-by: Matthew Brost <matthew.brost@intel.com> >>>> --- >>>> drivers/gpu/drm/i915/gem/i915_gem_context.c | 7 +++++++ >>>> 1 file changed, 7 insertions(+) >>>> >>>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c >>>> index 05c3ee191710..9c3672bac0e2 100644 >>>> --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c >>>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c >>>> @@ -446,6 +446,13 @@ set_proto_ctx_engines_bond(struct i915_user_extension __user *base, void *data) >>>> u16 idx, num_bonds; >>>> int err, n; >>>> >>>> + if (GRAPHICS_VER(i915) >= 12 && !IS_TIGERLAKE(i915) && >>>> + !IS_ROCKETLAKE(i915) && !IS_ALDERLAKE_S(i915)) { >>>> + drm_dbg(&i915->drm, >>>> + "Bonding on gen12+ aside from TGL, RKL, and ADL_S not allowed\n"); >>> I would have said not supported rather than not allowed. Either way: >>> Reviewed-by: John Harrison <John.C.Harrison@Intel.com> >> >> Either is fine with me. >> >> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> >> > > Applied to drm-intel-gt-next (with the suggested debug message wording > tweak). Thanks for the patch and reviews. > > > Matt > >>> >>>> + return -ENODEV; >>>> + } >>>> + >>>> if (get_user(idx, &ext->virtual_index)) >>>> return -EFAULT; >>>> >>> >> >> >> -- >> Daniel Vetter >> Software Engineer, Intel Corporation >> http://blog.ffwll.ch >
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c index 05c3ee191710..9c3672bac0e2 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c @@ -446,6 +446,13 @@ set_proto_ctx_engines_bond(struct i915_user_extension __user *base, void *data) u16 idx, num_bonds; int err, n; + if (GRAPHICS_VER(i915) >= 12 && !IS_TIGERLAKE(i915) && + !IS_ROCKETLAKE(i915) && !IS_ALDERLAKE_S(i915)) { + drm_dbg(&i915->drm, + "Bonding on gen12+ aside from TGL, RKL, and ADL_S not allowed\n"); + return -ENODEV; + } + if (get_user(idx, &ext->virtual_index)) return -EFAULT;
Disable bonding on gen12+ platforms aside from ones already supported by the i915 - TGL, RKL, and ADL-S. Signed-off-by: Matthew Brost <matthew.brost@intel.com> --- drivers/gpu/drm/i915/gem/i915_gem_context.c | 7 +++++++ 1 file changed, 7 insertions(+)