[PATCH] drm/i915/display: Fix BMG CCS modifiers

[PATCH] drm/i915/display: Fix BMG CCS modifiers

[Juha-Pekka Heikkila]

Let I915_FORMAT_MOD_4_TILED_BMG_CCS show up as supported modifier

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
---
 drivers/gpu/drm/i915/display/skl_universal_plane.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 9452cad41d07..d28b98e7cbd7 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -2453,6 +2453,9 @@ static u8 skl_get_plane_caps(struct drm_i915_private *i915,
 	if (gen12_plane_has_mc_ccs(i915, plane_id))
 		caps |= INTEL_PLANE_CAP_CCS_MC;
 
+	if (GRAPHICS_VER(i915) >= 20 && IS_DGFX(i915))
+		caps |= INTEL_PLANE_CAP_NEED64K_PHYS;
+
 	return caps;
 }
 
-- 
2.45.2

Re: [PATCH] drm/i915/display: Fix BMG CCS modifiers

[Rodrigo Vivi]

On Thu, Aug 29, 2024 at 03:29:28PM +0300, Juha-Pekka Heikkila wrote:
> Let I915_FORMAT_MOD_4_TILED_BMG_CCS show up as supported modifier
> 

doh! I just did the pull-request with that... I guess this is one extra
pull request next week or the first patch of -next-fixes :/

Fixes: 97c6efb36497 ("drm/i915/display: Plane capability for 64k phys alignment")

> Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
> ---
>  drivers/gpu/drm/i915/display/skl_universal_plane.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index 9452cad41d07..d28b98e7cbd7 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -2453,6 +2453,9 @@ static u8 skl_get_plane_caps(struct drm_i915_private *i915,
>  	if (gen12_plane_has_mc_ccs(i915, plane_id))
>  		caps |= INTEL_PLANE_CAP_CCS_MC;
>  
> +	if (GRAPHICS_VER(i915) >= 20 && IS_DGFX(i915))

we should be using display version here, no?!

> +		caps |= INTEL_PLANE_CAP_NEED64K_PHYS;
> +
>  	return caps;
>  }
>  
> -- 
> 2.45.2
> 

Re: [PATCH] drm/i915/display: Fix BMG CCS modifiers

[Maarten Lankhorst]

Hey,

D'oh, serves me right for changing patch around at last moment. :)

Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

Cheers,
~Maarten

Den 2024-08-29 kl. 16:29, skrev Rodrigo Vivi:
> On Thu, Aug 29, 2024 at 03:29:28PM +0300, Juha-Pekka Heikkila wrote:
>> Let I915_FORMAT_MOD_4_TILED_BMG_CCS show up as supported modifier
>>
> 
> doh! I just did the pull-request with that... I guess this is one extra
> pull request next week or the first patch of -next-fixes :/
> 
> Fixes: 97c6efb36497 ("drm/i915/display: Plane capability for 64k phys alignment")
> 
>> Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
>> ---
>>  drivers/gpu/drm/i915/display/skl_universal_plane.c | 3 +++
>>  1 file changed, 3 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
>> index 9452cad41d07..d28b98e7cbd7 100644
>> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
>> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
>> @@ -2453,6 +2453,9 @@ static u8 skl_get_plane_caps(struct drm_i915_private *i915,
>>  	if (gen12_plane_has_mc_ccs(i915, plane_id))
>>  		caps |= INTEL_PLANE_CAP_CCS_MC;
>>  
>> +	if (GRAPHICS_VER(i915) >= 20 && IS_DGFX(i915))
> 
> we should be using display version here, no?!
> 
>> +		caps |= INTEL_PLANE_CAP_NEED64K_PHYS;
>> +
>>  	return caps;
>>  }
>>  
>> -- 
>> 2.45.2
>>

Re: [PATCH] drm/i915/display: Fix BMG CCS modifiers

[Maarten Lankhorst]

Den 2024-08-29 kl. 16:29, skrev Rodrigo Vivi:
> On Thu, Aug 29, 2024 at 03:29:28PM +0300, Juha-Pekka Heikkila wrote:
>> Let I915_FORMAT_MOD_4_TILED_BMG_CCS show up as supported modifier
>>
> 
> doh! I just did the pull-request with that... I guess this is one extra
> pull request next week or the first patch of -next-fixes :/
> 
> Fixes: 97c6efb36497 ("drm/i915/display: Plane capability for 64k phys alignment")
> 
>> Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
>> ---
>>  drivers/gpu/drm/i915/display/skl_universal_plane.c | 3 +++
>>  1 file changed, 3 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
>> index 9452cad41d07..d28b98e7cbd7 100644
>> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
>> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
>> @@ -2453,6 +2453,9 @@ static u8 skl_get_plane_caps(struct drm_i915_private *i915,
>>  	if (gen12_plane_has_mc_ccs(i915, plane_id))
>>  		caps |= INTEL_PLANE_CAP_CCS_MC;
>>  
>> +	if (GRAPHICS_VER(i915) >= 20 && IS_DGFX(i915))
> 
> we should be using display version here, no?!
> 
>> +		caps |= INTEL_PLANE_CAP_NEED64K_PHYS;
Just set it unconditionally if you want to change it IMO, it's a workaround not an actual capability, rest should filter...

Re: [PATCH] drm/i915/display: Fix BMG CCS modifiers

[Imre Deak]

On Thu, Aug 29, 2024 at 04:36:52PM +0200, Maarten Lankhorst wrote:
> 
> 
> Den 2024-08-29 kl. 16:29, skrev Rodrigo Vivi:
> > On Thu, Aug 29, 2024 at 03:29:28PM +0300, Juha-Pekka Heikkila wrote:
> >> Let I915_FORMAT_MOD_4_TILED_BMG_CCS show up as supported modifier
> >>
> > 
> > doh! I just did the pull-request with that... I guess this is one extra
> > pull request next week or the first patch of -next-fixes :/
> > 
> > Fixes: 97c6efb36497 ("drm/i915/display: Plane capability for 64k phys alignment")
> > 
> >> Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
> >> ---
> >>  drivers/gpu/drm/i915/display/skl_universal_plane.c | 3 +++
> >>  1 file changed, 3 insertions(+)
> >>
> >> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> >> index 9452cad41d07..d28b98e7cbd7 100644
> >> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> >> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> >> @@ -2453,6 +2453,9 @@ static u8 skl_get_plane_caps(struct drm_i915_private *i915,
> >>  	if (gen12_plane_has_mc_ccs(i915, plane_id))
> >>  		caps |= INTEL_PLANE_CAP_CCS_MC;
> >>  
> >> +	if (GRAPHICS_VER(i915) >= 20 && IS_DGFX(i915))
> > 
> > we should be using display version here, no?!
> > 
> >> +		caps |= INTEL_PLANE_CAP_NEED64K_PHYS;
>
> Just set it unconditionally if you want to change it IMO, it's a
> workaround not an actual capability, rest should filter...

I think it should be set only on platforms that actually require 64K
pages. So IIUC simply
   IS_BATTLEMAGE()
or if it's known that future DGFX has this restriction too
   IS_BATTLEMAGE() || (DISPLAY_VER() >= 20 && IS_DGFX())
? Then the BMG and LNL checks in plane_has_modifier() wouldn't be
needed either.

--Imre

✓ Fi.CI.BAT: success for drm/i915/display: Fix BMG CCS modifiers

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 8783 bytes --]

== Series Details ==

Series: drm/i915/display: Fix BMG CCS modifiers
URL   : https://patchwork.freedesktop.org/series/137958/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_15323 -> Patchwork_137958v1
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/index.html

Participating hosts (38 -> 36)
------------------------------

  Additional (1): bat-arlh-2 
  Missing    (3): bat-dg1-7 fi-snb-2520m bat-mtlp-6 

Known issues
------------

  Here are the changes found in Patchwork_137958v1 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@debugfs_test@basic-hwmon:
    - bat-arlh-2:         NOTRUN -> [SKIP][1] ([i915#9318])
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-arlh-2/igt@debugfs_test@basic-hwmon.html

  * igt@fbdev@eof:
    - bat-arlh-2:         NOTRUN -> [SKIP][2] ([i915#11345]) +3 other tests skip
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-arlh-2/igt@fbdev@eof.html

  * igt@fbdev@info:
    - bat-arlh-2:         NOTRUN -> [SKIP][3] ([i915#1849])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-arlh-2/igt@fbdev@info.html

  * igt@fbdev@read:
    - bat-arls-1:         [PASS][4] -> [DMESG-FAIL][5] ([i915#9157])
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15323/bat-arls-1/igt@fbdev@read.html
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-arls-1/igt@fbdev@read.html

  * igt@gem_lmem_swapping@parallel-random-engines:
    - bat-arlh-2:         NOTRUN -> [SKIP][6] ([i915#10213] / [i915#11671]) +3 other tests skip
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-arlh-2/igt@gem_lmem_swapping@parallel-random-engines.html

  * igt@gem_mmap@basic:
    - bat-arlh-2:         NOTRUN -> [SKIP][7] ([i915#11343])
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-arlh-2/igt@gem_mmap@basic.html

  * igt@gem_render_tiled_blits@basic:
    - bat-arlh-2:         NOTRUN -> [SKIP][8] ([i915#10197] / [i915#11725])
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-arlh-2/igt@gem_render_tiled_blits@basic.html

  * igt@gem_tiled_fence_blits@basic:
    - bat-arlh-2:         NOTRUN -> [SKIP][9] ([i915#10196]) +4 other tests skip
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-arlh-2/igt@gem_tiled_fence_blits@basic.html

  * igt@gem_tiled_pread_basic:
    - bat-arlh-2:         NOTRUN -> [SKIP][10] ([i915#10206] / [i915#11724])
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-arlh-2/igt@gem_tiled_pread_basic.html

  * igt@i915_pm_rps@basic-api:
    - bat-arlh-2:         NOTRUN -> [SKIP][11] ([i915#10209] / [i915#11681])
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-arlh-2/igt@i915_pm_rps@basic-api.html

  * igt@i915_selftest@live@workarounds:
    - bat-mtlp-8:         [PASS][12] -> [ABORT][13] ([i915#12062])
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15323/bat-mtlp-8/igt@i915_selftest@live@workarounds.html
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-mtlp-8/igt@i915_selftest@live@workarounds.html

  * igt@kms_addfb_basic@basic-x-tiled-legacy:
    - bat-arlh-2:         NOTRUN -> [SKIP][14] ([i915#10200] / [i915#11666]) +9 other tests skip
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-arlh-2/igt@kms_addfb_basic@basic-x-tiled-legacy.html

  * igt@kms_pm_backlight@basic-brightness:
    - bat-arlh-2:         NOTRUN -> [SKIP][15] ([i915#11346]) +32 other tests skip
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-arlh-2/igt@kms_pm_backlight@basic-brightness.html

  * igt@kms_setmode@basic-clone-single-crtc:
    - bat-arlh-2:         NOTRUN -> [SKIP][16] ([i915#10208] / [i915#8809])
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-arlh-2/igt@kms_setmode@basic-clone-single-crtc.html

  * igt@prime_vgem@basic-fence-read:
    - bat-arlh-2:         NOTRUN -> [SKIP][17] ([i915#10212] / [i915#11726])
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-arlh-2/igt@prime_vgem@basic-fence-read.html

  * igt@prime_vgem@basic-read:
    - bat-arlh-2:         NOTRUN -> [SKIP][18] ([i915#10214] / [i915#11726])
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-arlh-2/igt@prime_vgem@basic-read.html

  * igt@prime_vgem@basic-write:
    - bat-arlh-2:         NOTRUN -> [SKIP][19] ([i915#10216] / [i915#11723])
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-arlh-2/igt@prime_vgem@basic-write.html

  
#### Possible fixes ####

  * igt@fbdev@eof:
    - bat-arls-1:         [DMESG-WARN][20] ([i915#9157]) -> [PASS][21]
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15323/bat-arls-1/igt@fbdev@eof.html
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-arls-1/igt@fbdev@eof.html

  * igt@i915_selftest@live@hangcheck:
    - bat-arls-2:         [DMESG-WARN][22] ([i915#11349]) -> [PASS][23]
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15323/bat-arls-2/igt@i915_selftest@live@hangcheck.html
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-arls-2/igt@i915_selftest@live@hangcheck.html
    - bat-arls-1:         [DMESG-WARN][24] ([i915#11349]) -> [PASS][25]
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15323/bat-arls-1/igt@i915_selftest@live@hangcheck.html
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-arls-1/igt@i915_selftest@live@hangcheck.html

  * igt@vgem_basic@unload:
    - {bat-arlh-3}:       [INCOMPLETE][26] ([i915#10420]) -> [PASS][27]
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15323/bat-arlh-3/igt@vgem_basic@unload.html
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/bat-arlh-3/igt@vgem_basic@unload.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [i915#10196]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10196
  [i915#10197]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10197
  [i915#10200]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10200
  [i915#10206]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10206
  [i915#10208]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10208
  [i915#10209]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10209
  [i915#10212]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10212
  [i915#10213]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10213
  [i915#10214]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10214
  [i915#10216]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10216
  [i915#10420]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10420
  [i915#11343]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11343
  [i915#11345]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11345
  [i915#11346]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11346
  [i915#11349]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11349
  [i915#11666]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11666
  [i915#11671]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11671
  [i915#11681]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11681
  [i915#11723]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11723
  [i915#11724]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11724
  [i915#11725]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11725
  [i915#11726]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11726
  [i915#12062]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12062
  [i915#1849]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/1849
  [i915#8809]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/8809
  [i915#9157]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9157
  [i915#9318]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9318


Build changes
-------------

  * Linux: CI_DRM_15323 -> Patchwork_137958v1

  CI-20190529: 20190529
  CI_DRM_15323: 7ae5f4b6787d6b8a0ca1ab1f3a71d5bb71783fe2 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_7997: c70810080fa12a37859c45f16445797c5d849d4d @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_137958v1: 7ae5f4b6787d6b8a0ca1ab1f3a71d5bb71783fe2 @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_137958v1/index.html

[-- Attachment #2: Type: text/html, Size: 10085 bytes --]

Re: [PATCH] drm/i915/display: Fix BMG CCS modifiers

[Juha-Pekka Heikkila]

On 29.8.2024 18.13, Imre Deak wrote:
> On Thu, Aug 29, 2024 at 04:36:52PM +0200, Maarten Lankhorst wrote:
>>
>>
>> Den 2024-08-29 kl. 16:29, skrev Rodrigo Vivi:
>>> On Thu, Aug 29, 2024 at 03:29:28PM +0300, Juha-Pekka Heikkila wrote:
>>>> Let I915_FORMAT_MOD_4_TILED_BMG_CCS show up as supported modifier
>>>>
>>>
>>> doh! I just did the pull-request with that... I guess this is one extra
>>> pull request next week or the first patch of -next-fixes :/
>>>
>>> Fixes: 97c6efb36497 ("drm/i915/display: Plane capability for 64k phys alignment")
>>>
>>>> Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
>>>> ---
>>>>   drivers/gpu/drm/i915/display/skl_universal_plane.c | 3 +++
>>>>   1 file changed, 3 insertions(+)
>>>>
>>>> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
>>>> index 9452cad41d07..d28b98e7cbd7 100644
>>>> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
>>>> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
>>>> @@ -2453,6 +2453,9 @@ static u8 skl_get_plane_caps(struct drm_i915_private *i915,
>>>>   	if (gen12_plane_has_mc_ccs(i915, plane_id))
>>>>   		caps |= INTEL_PLANE_CAP_CCS_MC;
>>>>   
>>>> +	if (GRAPHICS_VER(i915) >= 20 && IS_DGFX(i915))
>>>
>>> we should be using display version here, no?!
>>>
>>>> +		caps |= INTEL_PLANE_CAP_NEED64K_PHYS;
>>
>> Just set it unconditionally if you want to change it IMO, it's a
>> workaround not an actual capability, rest should filter...
> 
> I think it should be set only on platforms that actually require 64K
> pages. So IIUC simply
>     IS_BATTLEMAGE()
> or if it's known that future DGFX has this restriction too
>     IS_BATTLEMAGE() || (DISPLAY_VER() >= 20 && IS_DGFX())
> ? Then the BMG and LNL checks in plane_has_modifier() wouldn't be
> needed either.

This sound good idea for this case. It's bit of a trick to check with 
display versions we're on Xe2 which to me is synonym to gfx ver >= 20 
but I'll make v2 with this change. It is expected future dgfx will have 
same 64K requirement.

/Juha-Pekka