[Intel-gfx] [PATCH] drm/i915/selftests: Guard against redifinition of SZ_8G

[Intel-gfx] [PATCH] drm/i915/selftests: Guard against redifinition of SZ_8G

[Chris Wilson]

In the near future, upstream will introduce a SZ_8G macro that is
slightly different to our own. Employ a temporary ifndef to avoid
compilation failure until we have backmerged.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/selftests/intel_memory_region.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/selftests/intel_memory_region.c b/drivers/gpu/drm/i915/selftests/intel_memory_region.c
index a55079a061dd..75839db63bea 100644
--- a/drivers/gpu/drm/i915/selftests/intel_memory_region.c
+++ b/drivers/gpu/drm/i915/selftests/intel_memory_region.c
@@ -352,7 +352,9 @@ static int igt_mock_splintered_region(void *arg)
 	return err;
 }
 
+#ifndef SZ_8G
 #define SZ_8G BIT_ULL(33)
+#endif
 
 static int igt_mock_max_segment(void *arg)
 {
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH] drm/i915/selftests: Guard against redifinition of SZ_8G

[Chris Wilson]

In the near future, upstream will introduce a SZ_8G macro that is
slightly different to our own. Employ a temporary ifndef to avoid
compilation failure until we have backmerged.

References: 8b0fac44bd1f ("sizes.h: add SZ_8G/SZ_16G/SZ_32G macros")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/selftests/intel_memory_region.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/selftests/intel_memory_region.c b/drivers/gpu/drm/i915/selftests/intel_memory_region.c
index a55079a061dd..75839db63bea 100644
--- a/drivers/gpu/drm/i915/selftests/intel_memory_region.c
+++ b/drivers/gpu/drm/i915/selftests/intel_memory_region.c
@@ -352,7 +352,9 @@ static int igt_mock_splintered_region(void *arg)
 	return err;
 }
 
+#ifndef SZ_8G
 #define SZ_8G BIT_ULL(33)
+#endif
 
 static int igt_mock_max_segment(void *arg)
 {
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/selftests: Guard against redifinition of SZ_8G (rev2)

[Patchwork]

== Series Details ==

Series: drm/i915/selftests: Guard against redifinition of SZ_8G (rev2)
URL   : https://patchwork.freedesktop.org/series/85451/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
a1bfe2c002d1 drm/i915/selftests: Guard against redifinition of SZ_8G
-:10: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 8b0fac44bd1f ("sizes.h: add SZ_8G/SZ_16G/SZ_32G macros")'
#10: 
References: 8b0fac44bd1f ("sizes.h: add SZ_8G/SZ_16G/SZ_32G macros")

total: 1 errors, 0 warnings, 0 checks, 9 lines checked


_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/selftests: Guard against redifinition of SZ_8G (rev2)

[Patchwork]

[-- Attachment #1.1: Type: text/plain, Size: 4430 bytes --]

== Series Details ==

Series: drm/i915/selftests: Guard against redifinition of SZ_8G (rev2)
URL   : https://patchwork.freedesktop.org/series/85451/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_9542 -> Patchwork_19252
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_19252 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_19252, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

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

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_19252:

### IGT changes ###

#### Possible regressions ####

  * igt@i915_selftest@live@active:
    - fi-bwr-2160:        [PASS][1] -> [INCOMPLETE][2]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9542/fi-bwr-2160/igt@i915_selftest@live@active.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19252/fi-bwr-2160/igt@i915_selftest@live@active.html

  
#### Warnings ####

  * igt@i915_hangman@error-state-basic:
    - fi-apl-guc:         [DMESG-WARN][3] ([i915#1610]) -> [DMESG-WARN][4]
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9542/fi-apl-guc/igt@i915_hangman@error-state-basic.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19252/fi-apl-guc/igt@i915_hangman@error-state-basic.html

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

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

### IGT changes ###

#### Issues hit ####

  * igt@amdgpu/amd_basic@cs-compute:
    - fi-tgl-y:           NOTRUN -> [SKIP][5] ([fdo#109315] / [i915#2575]) +5 similar issues
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19252/fi-tgl-y/igt@amdgpu/amd_basic@cs-compute.html

  * igt@gem_close_race@basic-threads:
    - fi-tgl-y:           [PASS][6] -> [DMESG-WARN][7] ([i915#402]) +2 similar issues
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9542/fi-tgl-y/igt@gem_close_race@basic-threads.html
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19252/fi-tgl-y/igt@gem_close_race@basic-threads.html

  * igt@i915_selftest@live@requests:
    - fi-kbl-soraka:      [PASS][8] -> [INCOMPLETE][9] ([i915#2782])
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9542/fi-kbl-soraka/igt@i915_selftest@live@requests.html
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19252/fi-kbl-soraka/igt@i915_selftest@live@requests.html

  * igt@runner@aborted:
    - fi-kbl-soraka:      NOTRUN -> [FAIL][10] ([i915#1436] / [i915#2295])
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19252/fi-kbl-soraka/igt@runner@aborted.html

  
#### Possible fixes ####

  * igt@gem_tiled_blits@basic:
    - fi-tgl-y:           [DMESG-WARN][11] ([i915#402]) -> [PASS][12] +2 similar issues
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9542/fi-tgl-y/igt@gem_tiled_blits@basic.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19252/fi-tgl-y/igt@gem_tiled_blits@basic.html

  
  [fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
  [i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
  [i915#1610]: https://gitlab.freedesktop.org/drm/intel/issues/1610
  [i915#2295]: https://gitlab.freedesktop.org/drm/intel/issues/2295
  [i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
  [i915#2782]: https://gitlab.freedesktop.org/drm/intel/issues/2782
  [i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402


Participating hosts (40 -> 37)
------------------------------

  Missing    (3): fi-ilk-m540 fi-bsw-cyan fi-bdw-samus 


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

  * Linux: CI_DRM_9542 -> Patchwork_19252

  CI-20190529: 20190529
  CI_DRM_9542: 64db0a08e9841f4cbe0fa5a37feba8606802fe13 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_5941: 58b135e66be4fa4db8f668fa5d125b31537cb9a6 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_19252: a1bfe2c002d1620b888ba869bbb70db998fa816e @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

a1bfe2c002d1 drm/i915/selftests: Guard against redifinition of SZ_8G

== Logs ==

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

[-- Attachment #1.2: Type: text/html, Size: 5264 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915/selftests: Guard against redifinition of SZ_8G

[Souza, Jose]

On Mon, 2021-01-04 at 17:13 +0000, Chris Wilson wrote:
> In the near future, upstream will introduce a SZ_8G macro that is
> slightly different to our own. Employ a temporary ifndef to avoid
> compilation failure until we have backmerged.

Already here!

Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

Will push this to fix build but from now on we probably want to remove this macro right?

> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
>  drivers/gpu/drm/i915/selftests/intel_memory_region.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/selftests/intel_memory_region.c b/drivers/gpu/drm/i915/selftests/intel_memory_region.c
> index a55079a061dd..75839db63bea 100644
> --- a/drivers/gpu/drm/i915/selftests/intel_memory_region.c
> +++ b/drivers/gpu/drm/i915/selftests/intel_memory_region.c
> @@ -352,7 +352,9 @@ static int igt_mock_splintered_region(void *arg)
>  	return err;
>  }
>  
> 
> 
> 
> +#ifndef SZ_8G
>  #define SZ_8G BIT_ULL(33)
> +#endif
>  
> 
> 
> 
>  static int igt_mock_max_segment(void *arg)
>  {

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915/selftests: Guard against redifinition of SZ_8G

[Chris Wilson]

Quoting Souza, Jose (2021-01-04 19:59:42)
> On Mon, 2021-01-04 at 17:13 +0000, Chris Wilson wrote:
> > In the near future, upstream will introduce a SZ_8G macro that is
> > slightly different to our own. Employ a temporary ifndef to avoid
> > compilation failure until we have backmerged.
> 
> Already here!
> 
> Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
> 
> Will push this to fix build but from now on we probably want to remove this macro right?

I'd wait to remove our local SZ_8G until after we backmerge into drm-intel-gt-next.
Got to keep both sides of the merge building.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx