[Intel-xe] [PATCH v2] drm/xe/migrate: Fix number of PT structs in docbook

[Intel-xe] [PATCH v2] drm/xe/migrate: Fix number of PT structs in docbook

[Niranjana Vishwanathapura]

Update xe_migrate_doc.h with 32 page table structs (not 48)

v2: minor typo fix

Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 drivers/gpu/drm/xe/xe_migrate_doc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/xe/xe_migrate_doc.h b/drivers/gpu/drm/xe/xe_migrate_doc.h
index 6a68fdff08dc..63c7d67b5b62 100644
--- a/drivers/gpu/drm/xe/xe_migrate_doc.h
+++ b/drivers/gpu/drm/xe/xe_migrate_doc.h
@@ -21,7 +21,7 @@
  * table BOs for updates, and identity map the entire device's VRAM with 1 GB
  * pages.
  *
- * Currently the page structure consists of 48 phyiscal pages with 16 being
+ * Currently the page structure consists of 32 physical pages with 16 being
  * reserved for BO mapping during copies and clear, 1 reserved for kernel binds,
  * several pages are needed to setup the identity mappings (exact number based
  * on how many bits of address space the device has), and the rest are reserved
-- 
2.21.0.rc0.32.g243a4c7e27

[Intel-xe] ✓ CI.Patch_applied: success for drm/xe/migrate: Fix number of PT structs in docbook (rev2)

[Patchwork]

== Series Details ==

Series: drm/xe/migrate: Fix number of PT structs in docbook (rev2)
URL   : https://patchwork.freedesktop.org/series/114560/
State : success

[Intel-xe] ✗ CI.KUnit: failure for drm/xe/migrate: Fix number of PT structs in docbook (rev2)

[Patchwork]

== Series Details ==

Series: drm/xe/migrate: Fix number of PT structs in docbook (rev2)
URL   : https://patchwork.freedesktop.org/series/114560/
State : failure

== Summary ==

+ trap cleanup EXIT
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/xe/.kunitconfig
ERROR:root:../drivers/gpu/drm/xe/xe_display.c: In function ‘xe_display_info_init’:
../drivers/gpu/drm/xe/xe_display.c:409:14: error: ‘CURSOR_C_OFFSET’ undeclared (first use in this function); did you mean ‘CURSOR_A_OFFSET’?
  409 |   [PIPE_C] = CURSOR_C_OFFSET, \
      |              ^~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/xe_display.c:422:2: note: in expansion of macro ‘__DISPLAY_DEFAULTS’
  422 |  __DISPLAY_DEFAULTS,      \
      |  ^~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/xe_display.c:476:56: note: in expansion of macro ‘GEN12_DISPLAY’
  476 |   xe->info.display = (struct xe_device_display_info) { GEN12_DISPLAY };
      |                                                        ^~~~~~~~~~~~~
../drivers/gpu/drm/xe/xe_display.c:409:14: note: each undeclared identifier is reported only once for each function it appears in
  409 |   [PIPE_C] = CURSOR_C_OFFSET, \
      |              ^~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/xe_display.c:422:2: note: in expansion of macro ‘__DISPLAY_DEFAULTS’
  422 |  __DISPLAY_DEFAULTS,      \
      |  ^~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/xe_display.c:476:56: note: in expansion of macro ‘GEN12_DISPLAY’
  476 |   xe->info.display = (struct xe_device_display_info) { GEN12_DISPLAY };
      |                                                        ^~~~~~~~~~~~~
../drivers/gpu/drm/xe/xe_display.c:410:14: error: ‘CURSOR_D_OFFSET’ undeclared (first use in this function); did you mean ‘CURSOR_A_OFFSET’?
  410 |   [PIPE_D] = CURSOR_D_OFFSET, \
      |              ^~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/xe_display.c:422:2: note: in expansion of macro ‘__DISPLAY_DEFAULTS’
  422 |  __DISPLAY_DEFAULTS,      \
      |  ^~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/xe_display.c:476:56: note: in expansion of macro ‘GEN12_DISPLAY’
  476 |   xe->info.display = (struct xe_device_display_info) { GEN12_DISPLAY };
      |                                                        ^~~~~~~~~~~~~
make[6]: *** [../scripts/Makefile.build:250: drivers/gpu/drm/xe/xe_display.o] Error 1
make[6]: *** Waiting for unfinished jobs....
make[5]: *** [../scripts/Makefile.build:500: drivers/gpu/drm/xe] Error 2
make[4]: *** [../scripts/Makefile.build:500: drivers/gpu/drm] Error 2
make[3]: *** [../scripts/Makefile.build:500: drivers/gpu] Error 2
make[2]: *** [../scripts/Makefile.build:500: drivers] Error 2
make[1]: *** [/kernel/Makefile:1992: .] Error 2
make: *** [Makefile:231: __sub-make] Error 2

[13:37:45] Configuring KUnit Kernel ...
Generating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
[13:37:49] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make ARCH=um O=.kunit --jobs=48
+ cleanup
++ stat -c %u:%g /kernel
+ chown -R 1003:1003 /kernel

Re: [Intel-xe] [PATCH v2] drm/xe/migrate: Fix number of PT structs in docbook

[Lucas De Marchi]

On Mon, Mar 06, 2023 at 05:34:59AM -0800, Niranjana Vishwanathapura wrote:
>Update xe_migrate_doc.h with 32 page table structs (not 48)
>
>v2: minor typo fix
>
>Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
>Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

unrelated fail in CI... it seems CI is applying series to the wrong
head.

applied, thanks

Lucas De Marchi

>---
> drivers/gpu/drm/xe/xe_migrate_doc.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_migrate_doc.h b/drivers/gpu/drm/xe/xe_migrate_doc.h
>index 6a68fdff08dc..63c7d67b5b62 100644
>--- a/drivers/gpu/drm/xe/xe_migrate_doc.h
>+++ b/drivers/gpu/drm/xe/xe_migrate_doc.h
>@@ -21,7 +21,7 @@
>  * table BOs for updates, and identity map the entire device's VRAM with 1 GB
>  * pages.
>  *
>- * Currently the page structure consists of 48 phyiscal pages with 16 being
>+ * Currently the page structure consists of 32 physical pages with 16 being
>  * reserved for BO mapping during copies and clear, 1 reserved for kernel binds,
>  * several pages are needed to setup the identity mappings (exact number based
>  * on how many bits of address space the device has), and the rest are reserved
>-- 
>2.21.0.rc0.32.g243a4c7e27
>

Re: [Intel-xe] [PATCH v2] drm/xe/migrate: Fix number of PT structs in docbook

[Jani Nikula]

On Tue, 07 Mar 2023, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> On Mon, Mar 06, 2023 at 05:34:59AM -0800, Niranjana Vishwanathapura wrote:
>>Update xe_migrate_doc.h with 32 page table structs (not 48)
>>
>>v2: minor typo fix
>>
>>Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
>>Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>
> unrelated fail in CI... it seems CI is applying series to the wrong
> head.

Unrelated to the patch, why isn't the documentation in xe_migrate.c?
Having a separate xe_migrate_doc.h with just a documentation comment
seems like a weird new pattern.

IMO the documentation should be placed either as a comment in the
relevant .c file or in an rst file under Documentation/gpu/xe.


BR,
Jani.

>
> applied, thanks
>
> Lucas De Marchi
>
>>---
>> drivers/gpu/drm/xe/xe_migrate_doc.h | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>>diff --git a/drivers/gpu/drm/xe/xe_migrate_doc.h b/drivers/gpu/drm/xe/xe_migrate_doc.h
>>index 6a68fdff08dc..63c7d67b5b62 100644
>>--- a/drivers/gpu/drm/xe/xe_migrate_doc.h
>>+++ b/drivers/gpu/drm/xe/xe_migrate_doc.h
>>@@ -21,7 +21,7 @@
>>  * table BOs for updates, and identity map the entire device's VRAM with 1 GB
>>  * pages.
>>  *
>>- * Currently the page structure consists of 48 phyiscal pages with 16 being
>>+ * Currently the page structure consists of 32 physical pages with 16 being
>>  * reserved for BO mapping during copies and clear, 1 reserved for kernel binds,
>>  * several pages are needed to setup the identity mappings (exact number based
>>  * on how many bits of address space the device has), and the rest are reserved
>>-- 
>>2.21.0.rc0.32.g243a4c7e27
>>

-- 
Jani Nikula, Intel Open Source Graphics Center