* [Intel-gfx] [PATCH] drm/i915/mtl: Add support of Tile4 to MTL
@ 2022-12-19 13:50 Stanislav Lisovskiy
2022-12-19 18:27 ` Juha-Pekka Heikkila
0 siblings, 1 reply; 5+ messages in thread
From: Stanislav Lisovskiy @ 2022-12-19 13:50 UTC (permalink / raw)
To: intel-gfx; +Cc: juha-pekka.heikkila
We have some Tile4 tests now skipping, which were
supposed to be working. So lets make them work, by
adding display_ver 14 as supported.
Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
---
drivers/gpu/drm/i915/display/intel_fb.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index 63137ae5ab217..75a17f38def53 100644
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -158,11 +158,11 @@ struct intel_modifier_desc {
static const struct intel_modifier_desc intel_modifiers[] = {
{
.modifier = I915_FORMAT_MOD_4_TILED_DG2_MC_CCS,
- .display_ver = { 13, 13 },
+ .display_ver = { 13, 14 },
.plane_caps = INTEL_PLANE_CAP_TILING_4 | INTEL_PLANE_CAP_CCS_MC,
}, {
.modifier = I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC,
- .display_ver = { 13, 13 },
+ .display_ver = { 13, 14 },
.plane_caps = INTEL_PLANE_CAP_TILING_4 | INTEL_PLANE_CAP_CCS_RC_CC,
.ccs.cc_planes = BIT(1),
@@ -170,11 +170,11 @@ static const struct intel_modifier_desc intel_modifiers[] = {
FORMAT_OVERRIDE(gen12_flat_ccs_cc_formats),
}, {
.modifier = I915_FORMAT_MOD_4_TILED_DG2_RC_CCS,
- .display_ver = { 13, 13 },
+ .display_ver = { 13, 14 },
.plane_caps = INTEL_PLANE_CAP_TILING_4 | INTEL_PLANE_CAP_CCS_RC,
}, {
.modifier = I915_FORMAT_MOD_4_TILED,
- .display_ver = { 13, 13 },
+ .display_ver = { 13, 14 },
.plane_caps = INTEL_PLANE_CAP_TILING_4,
}, {
.modifier = I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS,
--
2.37.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915/mtl: Add support of Tile4 to MTL
2022-12-19 13:50 [Intel-gfx] [PATCH] drm/i915/mtl: Add support of Tile4 to MTL Stanislav Lisovskiy
@ 2022-12-19 18:27 ` Juha-Pekka Heikkila
2022-12-20 10:13 ` Lisovskiy, Stanislav
0 siblings, 1 reply; 5+ messages in thread
From: Juha-Pekka Heikkila @ 2022-12-19 18:27 UTC (permalink / raw)
To: Stanislav Lisovskiy, intel-gfx
Hi Stan,
On 19.12.2022 15.50, Stanislav Lisovskiy wrote:
> We have some Tile4 tests now skipping, which were
> supposed to be working. So lets make them work, by
> adding display_ver 14 as supported.
>
> Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_fb.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
> index 63137ae5ab217..75a17f38def53 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.c
> +++ b/drivers/gpu/drm/i915/display/intel_fb.c
> @@ -158,11 +158,11 @@ struct intel_modifier_desc {
> static const struct intel_modifier_desc intel_modifiers[] = {
> {
> .modifier = I915_FORMAT_MOD_4_TILED_DG2_MC_CCS,
> - .display_ver = { 13, 13 },
> + .display_ver = { 13, 14 },
I don't think you'd want to do this. These DG2 ccs modifiers rely on
usage of flat ccs which is not present in Meteorlake.
> .plane_caps = INTEL_PLANE_CAP_TILING_4 | INTEL_PLANE_CAP_CCS_MC,
> }, {
> .modifier = I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC,
> - .display_ver = { 13, 13 },
> + .display_ver = { 13, 14 },
Let's drop this change too.
> .plane_caps = INTEL_PLANE_CAP_TILING_4 | INTEL_PLANE_CAP_CCS_RC_CC,
>
> .ccs.cc_planes = BIT(1),
> @@ -170,11 +170,11 @@ static const struct intel_modifier_desc intel_modifiers[] = {
> FORMAT_OVERRIDE(gen12_flat_ccs_cc_formats),
> }, {
> .modifier = I915_FORMAT_MOD_4_TILED_DG2_RC_CCS,
> - .display_ver = { 13, 13 },
> + .display_ver = { 13, 14 },
And this.
> .plane_caps = INTEL_PLANE_CAP_TILING_4 | INTEL_PLANE_CAP_CCS_RC,
> }, {
> .modifier = I915_FORMAT_MOD_4_TILED,
> - .display_ver = { 13, 13 },
> + .display_ver = { 13, 14 },
Here you could do something like ".display_ver = { 13, -1 }," to enable
tile4 from version 13 onward and we'll fix it if it ever change in the
future.
/Juha-Pekka
> .plane_caps = INTEL_PLANE_CAP_TILING_4,
> }, {
> .modifier = I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS,
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915/mtl: Add support of Tile4 to MTL
2022-12-19 18:27 ` Juha-Pekka Heikkila
@ 2022-12-20 10:13 ` Lisovskiy, Stanislav
0 siblings, 0 replies; 5+ messages in thread
From: Lisovskiy, Stanislav @ 2022-12-20 10:13 UTC (permalink / raw)
To: Juha-Pekka Heikkila; +Cc: intel-gfx
On Mon, Dec 19, 2022 at 08:27:30PM +0200, Juha-Pekka Heikkila wrote:
> Hi Stan,
>
> On 19.12.2022 15.50, Stanislav Lisovskiy wrote:
> > We have some Tile4 tests now skipping, which were
> > supposed to be working. So lets make them work, by
> > adding display_ver 14 as supported.
> >
> > Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
> > ---
> > drivers/gpu/drm/i915/display/intel_fb.c | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
> > index 63137ae5ab217..75a17f38def53 100644
> > --- a/drivers/gpu/drm/i915/display/intel_fb.c
> > +++ b/drivers/gpu/drm/i915/display/intel_fb.c
> > @@ -158,11 +158,11 @@ struct intel_modifier_desc {
> > static const struct intel_modifier_desc intel_modifiers[] = {
> > {
> > .modifier = I915_FORMAT_MOD_4_TILED_DG2_MC_CCS,
> > - .display_ver = { 13, 13 },
> > + .display_ver = { 13, 14 },
>
> I don't think you'd want to do this. These DG2 ccs modifiers rely on usage
> of flat ccs which is not present in Meteorlake.
>
> > .plane_caps = INTEL_PLANE_CAP_TILING_4 | INTEL_PLANE_CAP_CCS_MC,
> > }, {
> > .modifier = I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC,
> > - .display_ver = { 13, 13 },
> > + .display_ver = { 13, 14 },
>
> Let's drop this change too.
>
> > .plane_caps = INTEL_PLANE_CAP_TILING_4 | INTEL_PLANE_CAP_CCS_RC_CC,
> > .ccs.cc_planes = BIT(1),
> > @@ -170,11 +170,11 @@ static const struct intel_modifier_desc intel_modifiers[] = {
> > FORMAT_OVERRIDE(gen12_flat_ccs_cc_formats),
> > }, {
> > .modifier = I915_FORMAT_MOD_4_TILED_DG2_RC_CCS,
> > - .display_ver = { 13, 13 },
> > + .display_ver = { 13, 14 },
>
> And this.
Ah, I have been surfing yesterday the spec, trying to find if ccs is supported or not, looks like
I got bit confused.
>
> > .plane_caps = INTEL_PLANE_CAP_TILING_4 | INTEL_PLANE_CAP_CCS_RC,
> > }, {
> > .modifier = I915_FORMAT_MOD_4_TILED,
> > - .display_ver = { 13, 13 },
> > + .display_ver = { 13, 14 },
>
> Here you could do something like ".display_ver = { 13, -1 }," to enable
> tile4 from version 13 onward and we'll fix it if it ever change in the
> future.
Yeah, recently had similar approach in other feature.
Stan
>
> /Juha-Pekka
>
> > .plane_caps = INTEL_PLANE_CAP_TILING_4,
> > }, {
> > .modifier = I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS,
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Intel-gfx] [PATCH] drm/i915/mtl: Add support of Tile4 to MTL
@ 2022-12-20 16:29 Stanislav Lisovskiy
2022-12-20 21:23 ` Juha-Pekka Heikkila
0 siblings, 1 reply; 5+ messages in thread
From: Stanislav Lisovskiy @ 2022-12-20 16:29 UTC (permalink / raw)
To: intel-gfx; +Cc: juha-pekka.heikkila
We have some Tile4 tests now skipping, which were
supposed to be working. So lets make them work, by
adding display_ver 14 as supported.
v2: - Remove "14" for Tile 4 CCS formats, as they
seem to be not supported by DG2(Juha-Pekka Heikkila)
- For generic Tile 4, the opposite - lets use -1
in order to make sure all the next gens support it by
default(Juha-Pekka Heikkila)
Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
---
drivers/gpu/drm/i915/display/intel_fb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index 63137ae5ab217..93d0e46e54813 100644
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -174,7 +174,7 @@ static const struct intel_modifier_desc intel_modifiers[] = {
.plane_caps = INTEL_PLANE_CAP_TILING_4 | INTEL_PLANE_CAP_CCS_RC,
}, {
.modifier = I915_FORMAT_MOD_4_TILED,
- .display_ver = { 13, 13 },
+ .display_ver = { 13, -1 },
.plane_caps = INTEL_PLANE_CAP_TILING_4,
}, {
.modifier = I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS,
--
2.37.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915/mtl: Add support of Tile4 to MTL
2022-12-20 16:29 Stanislav Lisovskiy
@ 2022-12-20 21:23 ` Juha-Pekka Heikkila
0 siblings, 0 replies; 5+ messages in thread
From: Juha-Pekka Heikkila @ 2022-12-20 21:23 UTC (permalink / raw)
To: Stanislav Lisovskiy, intel-gfx
On 20.12.2022 18.29, Stanislav Lisovskiy wrote:
> We have some Tile4 tests now skipping, which were
> supposed to be working. So lets make them work, by
> adding display_ver 14 as supported.
>
> v2: - Remove "14" for Tile 4 CCS formats, as they
> seem to be not supported by DG2(Juha-Pekka Heikkila)
DG2 ccs modifiers not supported on MTL. DG2 ccs modifiers are of course
supported on DG2.
> - For generic Tile 4, the opposite - lets use -1
> in order to make sure all the next gens support it by
> default(Juha-Pekka Heikkila)
>
> Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_fb.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
> index 63137ae5ab217..93d0e46e54813 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.c
> +++ b/drivers/gpu/drm/i915/display/intel_fb.c
> @@ -174,7 +174,7 @@ static const struct intel_modifier_desc intel_modifiers[] = {
> .plane_caps = INTEL_PLANE_CAP_TILING_4 | INTEL_PLANE_CAP_CCS_RC,
> }, {
> .modifier = I915_FORMAT_MOD_4_TILED,
> - .display_ver = { 13, 13 },
> + .display_ver = { 13, -1 },
> .plane_caps = INTEL_PLANE_CAP_TILING_4,
> }, {
> .modifier = I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS,
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-12-20 21:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-19 13:50 [Intel-gfx] [PATCH] drm/i915/mtl: Add support of Tile4 to MTL Stanislav Lisovskiy
2022-12-19 18:27 ` Juha-Pekka Heikkila
2022-12-20 10:13 ` Lisovskiy, Stanislav
-- strict thread matches above, loose matches on Subject: below --
2022-12-20 16:29 Stanislav Lisovskiy
2022-12-20 21:23 ` Juha-Pekka Heikkila
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox