Op 15-10-18 om 11:52 schreef Maarten Lankhorst: > Gen11 supports 7 planes + 1 cursor on each pipe. Bump > I915_MAX_PLANES to 8, and set num_sprites correctly. > > Signed-off-by: Maarten Lankhorst <[email protected]> > Reviewed-by: Matt Roper <[email protected]> > --- > drivers/gpu/drm/i915/intel_device_info.c | 5 ++++- > drivers/gpu/drm/i915/intel_display.h | 3 +++ > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_device_info.c > b/drivers/gpu/drm/i915/intel_device_info.c > index 03df4e33763d..d95df6d76aaf 100644 > --- a/drivers/gpu/drm/i915/intel_device_info.c > +++ b/drivers/gpu/drm/i915/intel_device_info.c > @@ -760,7 +760,10 @@ void intel_device_info_runtime_init(struct > intel_device_info *info) > * we don't expose the topmost plane at all to prevent ABI breakage > * down the line. > */ > - if (IS_GEN10(dev_priv) || IS_GEMINILAKE(dev_priv)) > + if (IS_GEN11(dev_priv)) > + for_each_pipe(dev_priv, pipe) > + info->num_sprites[pipe] = 6; > + else if (IS_GEN10(dev_priv) || IS_GEMINILAKE(dev_priv)) > for_each_pipe(dev_priv, pipe) > info->num_sprites[pipe] = 3; > else if (IS_BROXTON(dev_priv)) { > diff --git a/drivers/gpu/drm/i915/intel_display.h > b/drivers/gpu/drm/i915/intel_display.h > index 9fac67e31205..47000b25f1ff 100644 > --- a/drivers/gpu/drm/i915/intel_display.h > +++ b/drivers/gpu/drm/i915/intel_display.h > @@ -120,6 +120,9 @@ enum plane_id { > PLANE_SPRITE0, > PLANE_SPRITE1, > PLANE_SPRITE2, > + PLANE_SPRITE3, > + PLANE_SPRITE4, > + PLANE_SPRITE5, > PLANE_CURSOR, > > I915_MAX_PLANES,
Oops, missed the Reviewed-by: Matt Roper <[email protected]> And should probably fix the stale comments. :) _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
