| Message ID | 20171220002410.5604-1-krisman@collabora.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 17-12-19 22:24:10, Gabriel Krisman Bertazi wrote: >Current code advertises (on the modifiers blob property) support for CCS >modifier for pipe C on GLK, only to reject it later when validating the >request before the atomic commit. > >This fixes the tests igt@kms_ccs@pipe-c-*, which should skip on GLK for >pipe C (see bug 104096). > >A relevant discussion is archived at: > >https://lists.freedesktop.org/archives/intel-gfx/2017-December/150646.html > >Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104096 >Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk> >Cc: Ben Widawsky <ben@bwidawsk.net> Reviewed-by: Ben Widawsky <ben@bwidawsk.net> >--- > drivers/gpu/drm/i915/intel_display.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c >index 1f7e312d0d0d..a50a5986af52 100644 >--- a/drivers/gpu/drm/i915/intel_display.c >+++ b/drivers/gpu/drm/i915/intel_display.c >@@ -13265,7 +13265,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) > primary->frontbuffer_bit = INTEL_FRONTBUFFER_PRIMARY(pipe); > primary->check_plane = intel_check_primary_plane; > >- if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) { >+ if (INTEL_GEN(dev_priv) >= 10) { > intel_primary_formats = skl_primary_formats; > num_formats = ARRAY_SIZE(skl_primary_formats); > modifiers = skl_format_modifiers_ccs; >-- >2.15.1 >
On Wed, Dec 20, 2017 at 03:43:14PM +0000, Ben Widawsky wrote: > On 17-12-19 22:24:10, Gabriel Krisman Bertazi wrote: > > Current code advertises (on the modifiers blob property) support for CCS > > modifier for pipe C on GLK, only to reject it later when validating the > > request before the atomic commit. > > > > This fixes the tests igt@kms_ccs@pipe-c-*, which should skip on GLK for > > pipe C (see bug 104096). > > > > A relevant discussion is archived at: > > > > https://lists.freedesktop.org/archives/intel-gfx/2017-December/150646.html > > > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104096 > > Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk> > > Cc: Ben Widawsky <ben@bwidawsk.net> > > Reviewed-by: Ben Widawsky <ben@bwidawsk.net> Merged to dinq. Thanks for the patch and review. > > > --- > > drivers/gpu/drm/i915/intel_display.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > index 1f7e312d0d0d..a50a5986af52 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -13265,7 +13265,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) > > primary->frontbuffer_bit = INTEL_FRONTBUFFER_PRIMARY(pipe); > > primary->check_plane = intel_check_primary_plane; > > > > - if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) { > > + if (INTEL_GEN(dev_priv) >= 10) { > > intel_primary_formats = skl_primary_formats; > > num_formats = ARRAY_SIZE(skl_primary_formats); > > modifiers = skl_format_modifiers_ccs; > > -- > > 2.15.1 > > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 1f7e312d0d0d..a50a5986af52 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13265,7 +13265,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) primary->frontbuffer_bit = INTEL_FRONTBUFFER_PRIMARY(pipe); primary->check_plane = intel_check_primary_plane; - if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) { + if (INTEL_GEN(dev_priv) >= 10) { intel_primary_formats = skl_primary_formats; num_formats = ARRAY_SIZE(skl_primary_formats); modifiers = skl_format_modifiers_ccs;
Current code advertises (on the modifiers blob property) support for CCS modifier for pipe C on GLK, only to reject it later when validating the request before the atomic commit. This fixes the tests igt@kms_ccs@pipe-c-*, which should skip on GLK for pipe C (see bug 104096). A relevant discussion is archived at: https://lists.freedesktop.org/archives/intel-gfx/2017-December/150646.html Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104096 Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk> Cc: Ben Widawsky <ben@bwidawsk.net> --- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)