* [Intel-gfx] [PATCH] drm/i915: make i915_drm_client_fdinfo() reference conditional again
@ 2023-06-16 9:31 Arnd Bergmann
2023-06-16 10:16 ` Andi Shyti
` (5 more replies)
0 siblings, 6 replies; 10+ messages in thread
From: Arnd Bergmann @ 2023-06-16 9:31 UTC (permalink / raw)
To: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, Tvrtko Ursulin,
David Airlie, Daniel Vetter, Andi Shyti
Cc: Arnd Bergmann, Alan Previn, Lucas De Marchi, linux-kernel,
dri-devel, Matt Roper, intel-gfx
From: Arnd Bergmann <arnd@arndb.de>
The function is only defined if CONFIG_PROC_FS is enabled:
ld.lld: error: undefined symbol: i915_drm_client_fdinfo
>>> referenced by i915_driver.c
>>> drivers/gpu/drm/i915/i915_driver.o:(i915_drm_driver) in archive vmlinux.a
Use the PTR_IF() helper to make the reference NULL otherwise.
Fixes: e894b724c316d ("drm/i915: Use the fdinfo helper")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/gpu/drm/i915/i915_driver.c | 2 +-
drivers/gpu/drm/i915/i915_drm_client.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 75cbc43b326dd..0ad0c5885ec27 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -1816,7 +1816,7 @@ static const struct drm_driver i915_drm_driver = {
.open = i915_driver_open,
.lastclose = i915_driver_lastclose,
.postclose = i915_driver_postclose,
- .show_fdinfo = i915_drm_client_fdinfo,
+ .show_fdinfo = PTR_IF(IS_ENABLED(CONFIG_PROC_FS), i915_drm_client_fdinfo),
.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
diff --git a/drivers/gpu/drm/i915/i915_drm_client.h b/drivers/gpu/drm/i915/i915_drm_client.h
index 4c18b99e10a4e..67816c912bca1 100644
--- a/drivers/gpu/drm/i915/i915_drm_client.h
+++ b/drivers/gpu/drm/i915/i915_drm_client.h
@@ -47,8 +47,6 @@ static inline void i915_drm_client_put(struct i915_drm_client *client)
struct i915_drm_client *i915_drm_client_alloc(void);
-#ifdef CONFIG_PROC_FS
void i915_drm_client_fdinfo(struct drm_printer *p, struct drm_file *file);
-#endif
#endif /* !__I915_DRM_CLIENT_H__ */
--
2.39.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: make i915_drm_client_fdinfo() reference conditional again
2023-06-16 9:31 [Intel-gfx] [PATCH] drm/i915: make i915_drm_client_fdinfo() reference conditional again Arnd Bergmann
@ 2023-06-16 10:16 ` Andi Shyti
2023-06-16 11:17 ` Tvrtko Ursulin
2023-06-16 13:23 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
` (4 subsequent siblings)
5 siblings, 1 reply; 10+ messages in thread
From: Andi Shyti @ 2023-06-16 10:16 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Arnd Bergmann, Matt Roper, Lucas De Marchi, linux-kernel,
Alan Previn, dri-devel, Daniel Vetter, Rodrigo Vivi, David Airlie,
intel-gfx
Hi Arnd,
On Fri, Jun 16, 2023 at 11:31:47AM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> The function is only defined if CONFIG_PROC_FS is enabled:
>
> ld.lld: error: undefined symbol: i915_drm_client_fdinfo
> >>> referenced by i915_driver.c
> >>> drivers/gpu/drm/i915/i915_driver.o:(i915_drm_driver) in archive vmlinux.a
>
> Use the PTR_IF() helper to make the reference NULL otherwise.
>
> Fixes: e894b724c316d ("drm/i915: Use the fdinfo helper")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/gpu/drm/i915/i915_driver.c | 2 +-
> drivers/gpu/drm/i915/i915_drm_client.h | 2 --
> 2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index 75cbc43b326dd..0ad0c5885ec27 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -1816,7 +1816,7 @@ static const struct drm_driver i915_drm_driver = {
> .open = i915_driver_open,
> .lastclose = i915_driver_lastclose,
> .postclose = i915_driver_postclose,
> - .show_fdinfo = i915_drm_client_fdinfo,
> + .show_fdinfo = PTR_IF(IS_ENABLED(CONFIG_PROC_FS), i915_drm_client_fdinfo),
>
> .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
> .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
> diff --git a/drivers/gpu/drm/i915/i915_drm_client.h b/drivers/gpu/drm/i915/i915_drm_client.h
> index 4c18b99e10a4e..67816c912bca1 100644
> --- a/drivers/gpu/drm/i915/i915_drm_client.h
> +++ b/drivers/gpu/drm/i915/i915_drm_client.h
> @@ -47,8 +47,6 @@ static inline void i915_drm_client_put(struct i915_drm_client *client)
>
> struct i915_drm_client *i915_drm_client_alloc(void);
>
> -#ifdef CONFIG_PROC_FS
> void i915_drm_client_fdinfo(struct drm_printer *p, struct drm_file *file);
> -#endif
nice! This is becoming the new trend now.
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Andi
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: make i915_drm_client_fdinfo() reference conditional again
2023-06-16 10:16 ` Andi Shyti
@ 2023-06-16 11:17 ` Tvrtko Ursulin
2023-06-19 9:04 ` Andi Shyti
2023-06-19 9:11 ` Tvrtko Ursulin
0 siblings, 2 replies; 10+ messages in thread
From: Tvrtko Ursulin @ 2023-06-16 11:17 UTC (permalink / raw)
To: Andi Shyti, Arnd Bergmann
Cc: Alan Previn, Arnd Bergmann, Matt Roper, Lucas De Marchi,
linux-kernel, dri-devel, Daniel Vetter, Rodrigo Vivi,
David Airlie, intel-gfx
On 16/06/2023 11:16, Andi Shyti wrote:
> Hi Arnd,
>
> On Fri, Jun 16, 2023 at 11:31:47AM +0200, Arnd Bergmann wrote:
>> From: Arnd Bergmann <arnd@arndb.de>
>>
>> The function is only defined if CONFIG_PROC_FS is enabled:
>>
>> ld.lld: error: undefined symbol: i915_drm_client_fdinfo
>>>>> referenced by i915_driver.c
>>>>> drivers/gpu/drm/i915/i915_driver.o:(i915_drm_driver) in archive vmlinux.a
>>
>> Use the PTR_IF() helper to make the reference NULL otherwise.
>>
>> Fixes: e894b724c316d ("drm/i915: Use the fdinfo helper")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> ---
>> drivers/gpu/drm/i915/i915_driver.c | 2 +-
>> drivers/gpu/drm/i915/i915_drm_client.h | 2 --
>> 2 files changed, 1 insertion(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
>> index 75cbc43b326dd..0ad0c5885ec27 100644
>> --- a/drivers/gpu/drm/i915/i915_driver.c
>> +++ b/drivers/gpu/drm/i915/i915_driver.c
>> @@ -1816,7 +1816,7 @@ static const struct drm_driver i915_drm_driver = {
>> .open = i915_driver_open,
>> .lastclose = i915_driver_lastclose,
>> .postclose = i915_driver_postclose,
>> - .show_fdinfo = i915_drm_client_fdinfo,
>> + .show_fdinfo = PTR_IF(IS_ENABLED(CONFIG_PROC_FS), i915_drm_client_fdinfo),
>>
>> .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
>> .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
>> diff --git a/drivers/gpu/drm/i915/i915_drm_client.h b/drivers/gpu/drm/i915/i915_drm_client.h
>> index 4c18b99e10a4e..67816c912bca1 100644
>> --- a/drivers/gpu/drm/i915/i915_drm_client.h
>> +++ b/drivers/gpu/drm/i915/i915_drm_client.h
>> @@ -47,8 +47,6 @@ static inline void i915_drm_client_put(struct i915_drm_client *client)
>>
>> struct i915_drm_client *i915_drm_client_alloc(void);
>>
>> -#ifdef CONFIG_PROC_FS
>> void i915_drm_client_fdinfo(struct drm_printer *p, struct drm_file *file);
>> -#endif
>
> nice! This is becoming the new trend now.
>
> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Thanks for the fix and review! (And I got to learn about existence of
PTR_IF too.)
Andi will you merge once green or should I?
Regards,
Tvrtko
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: make i915_drm_client_fdinfo() reference conditional again
2023-06-16 9:31 [Intel-gfx] [PATCH] drm/i915: make i915_drm_client_fdinfo() reference conditional again Arnd Bergmann
2023-06-16 10:16 ` Andi Shyti
@ 2023-06-16 13:23 ` Patchwork
2023-06-16 13:23 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
` (3 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2023-06-16 13:23 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: make i915_drm_client_fdinfo() reference conditional again
URL : https://patchwork.freedesktop.org/series/119441/
State : warning
== Summary ==
Error: dim checkpatch failed
e48e1d622c43 drm/i915: make i915_drm_client_fdinfo() reference conditional again
-:11: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#11:
>>> drivers/gpu/drm/i915/i915_driver.o:(i915_drm_driver) in archive vmlinux.a
-:15: WARNING:BAD_FIXES_TAG: Please use correct Fixes: style 'Fixes: <12 chars of sha1> ("<title line>")' - ie: 'Fixes: e894b724c316 ("drm/i915: Use the fdinfo helper")'
#15:
Fixes: e894b724c316d ("drm/i915: Use the fdinfo helper")
total: 0 errors, 2 warnings, 0 checks, 16 lines checked
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: make i915_drm_client_fdinfo() reference conditional again
2023-06-16 9:31 [Intel-gfx] [PATCH] drm/i915: make i915_drm_client_fdinfo() reference conditional again Arnd Bergmann
2023-06-16 10:16 ` Andi Shyti
2023-06-16 13:23 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
@ 2023-06-16 13:23 ` Patchwork
2023-06-16 13:32 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
` (2 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2023-06-16 13:23 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: make i915_drm_client_fdinfo() reference conditional again
URL : https://patchwork.freedesktop.org/series/119441/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: make i915_drm_client_fdinfo() reference conditional again
2023-06-16 9:31 [Intel-gfx] [PATCH] drm/i915: make i915_drm_client_fdinfo() reference conditional again Arnd Bergmann
` (2 preceding siblings ...)
2023-06-16 13:23 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
@ 2023-06-16 13:32 ` Patchwork
2023-06-16 16:18 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2023-06-17 0:44 ` [Intel-gfx] [PATCH] " Randy Dunlap
5 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2023-06-16 13:32 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 4898 bytes --]
== Series Details ==
Series: drm/i915: make i915_drm_client_fdinfo() reference conditional again
URL : https://patchwork.freedesktop.org/series/119441/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13278 -> Patchwork_119441v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/index.html
Participating hosts (42 -> 40)
------------------------------
Missing (2): bat-mtlp-8 fi-snb-2520m
Known issues
------------
Here are the changes found in Patchwork_119441v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@gt_lrc:
- bat-adlp-9: [PASS][1] -> [INCOMPLETE][2] ([i915#4983] / [i915#7913])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/bat-adlp-9/igt@i915_selftest@live@gt_lrc.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/bat-adlp-9/igt@i915_selftest@live@gt_lrc.html
* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- bat-dg2-11: NOTRUN -> [SKIP][3] ([i915#7828])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/bat-dg2-11/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
#### Possible fixes ####
* igt@i915_selftest@live@gt_lrc:
- bat-dg2-11: [INCOMPLETE][4] ([i915#7609] / [i915#7913]) -> [PASS][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/bat-dg2-11/igt@i915_selftest@live@gt_lrc.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/bat-dg2-11/igt@i915_selftest@live@gt_lrc.html
* igt@i915_selftest@live@gt_mocs:
- bat-mtlp-6: [DMESG-FAIL][6] ([i915#7059]) -> [PASS][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/bat-mtlp-6/igt@i915_selftest@live@gt_mocs.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/bat-mtlp-6/igt@i915_selftest@live@gt_mocs.html
* igt@i915_selftest@live@slpc:
- bat-mtlp-6: [DMESG-WARN][8] ([i915#6367]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/bat-mtlp-6/igt@i915_selftest@live@slpc.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/bat-mtlp-6/igt@i915_selftest@live@slpc.html
* igt@i915_selftest@live@workarounds:
- bat-rpls-2: [DMESG-FAIL][10] ([i915#6763] / [i915#7913]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/bat-rpls-2/igt@i915_selftest@live@workarounds.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/bat-rpls-2/igt@i915_selftest@live@workarounds.html
* igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-d-dp-1:
- bat-dg2-8: [FAIL][12] ([i915#7932]) -> [PASS][13] +1 similar issue
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-d-dp-1.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-d-dp-1.html
#### Warnings ####
* igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-a-edp-1:
- bat-adlp-6: [ABORT][14] ([i915#7977]) -> [ABORT][15] ([i915#7977] / [i915#8434])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/bat-adlp-6/igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-a-edp-1.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/bat-adlp-6/igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-a-edp-1.html
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6763]: https://gitlab.freedesktop.org/drm/intel/issues/6763
[i915#7059]: https://gitlab.freedesktop.org/drm/intel/issues/7059
[i915#7609]: https://gitlab.freedesktop.org/drm/intel/issues/7609
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7932]: https://gitlab.freedesktop.org/drm/intel/issues/7932
[i915#7977]: https://gitlab.freedesktop.org/drm/intel/issues/7977
[i915#8434]: https://gitlab.freedesktop.org/drm/intel/issues/8434
Build changes
-------------
* Linux: CI_DRM_13278 -> Patchwork_119441v1
CI-20190529: 20190529
CI_DRM_13278: 3c942541e24c0aaab070d498c57647e7b4e9aa6e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7334: 9dd259184050af3e5217e1a63e6b90b1b946e7c4 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_119441v1: 3c942541e24c0aaab070d498c57647e7b4e9aa6e @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
7af97a6e3f88 drm/i915: make i915_drm_client_fdinfo() reference conditional again
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/index.html
[-- Attachment #2: Type: text/html, Size: 5884 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: make i915_drm_client_fdinfo() reference conditional again
2023-06-16 9:31 [Intel-gfx] [PATCH] drm/i915: make i915_drm_client_fdinfo() reference conditional again Arnd Bergmann
` (3 preceding siblings ...)
2023-06-16 13:32 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
@ 2023-06-16 16:18 ` Patchwork
2023-06-17 0:44 ` [Intel-gfx] [PATCH] " Randy Dunlap
5 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2023-06-16 16:18 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 14569 bytes --]
== Series Details ==
Series: drm/i915: make i915_drm_client_fdinfo() reference conditional again
URL : https://patchwork.freedesktop.org/series/119441/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13278_full -> Patchwork_119441v1_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Participating hosts (7 -> 7)
------------------------------
No changes in participating hosts
Known issues
------------
Here are the changes found in Patchwork_119441v1_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_exec@basic-nohangcheck:
- shard-rkl: [PASS][1] -> [FAIL][2] ([i915#6268])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/shard-rkl-7/igt@gem_ctx_exec@basic-nohangcheck.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-rkl-1/igt@gem_ctx_exec@basic-nohangcheck.html
- shard-tglu: [PASS][3] -> [FAIL][4] ([i915#6268])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/shard-tglu-7/igt@gem_ctx_exec@basic-nohangcheck.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-tglu-10/igt@gem_ctx_exec@basic-nohangcheck.html
* igt@gem_exec_endless@dispatch@rcs0:
- shard-tglu: [PASS][5] -> [TIMEOUT][6] ([i915#3778] / [i915#7392] / [i915#7921])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/shard-tglu-5/igt@gem_exec_endless@dispatch@rcs0.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-tglu-9/igt@gem_exec_endless@dispatch@rcs0.html
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [PASS][7] -> [FAIL][8] ([i915#2842])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/shard-glk9/igt@gem_exec_fair@basic-pace-share@rcs0.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-glk8/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@i915_pm_dc@dc6-dpms:
- shard-tglu: [PASS][9] -> [FAIL][10] ([i915#3989] / [i915#454])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/shard-tglu-9/igt@i915_pm_dc@dc6-dpms.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-tglu-3/igt@i915_pm_dc@dc6-dpms.html
* igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-vga:
- shard-snb: NOTRUN -> [SKIP][11] ([fdo#109271] / [i915#4579]) +11 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-snb4/igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-vga.html
* igt@i915_pm_rpm@modeset-lpsp:
- shard-rkl: [PASS][12] -> [SKIP][13] ([i915#1397])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/shard-rkl-7/igt@i915_pm_rpm@modeset-lpsp.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-rkl-6/igt@i915_pm_rpm@modeset-lpsp.html
* igt@i915_suspend@basic-s3-without-i915:
- shard-rkl: [PASS][14] -> [FAIL][15] ([fdo#103375]) +6 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/shard-rkl-1/igt@i915_suspend@basic-s3-without-i915.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-rkl-6/igt@i915_suspend@basic-s3-without-i915.html
* igt@kms_async_flips@async-flip-with-page-flip-events@pipe-b-hdmi-a-1-y-rc_ccs:
- shard-rkl: NOTRUN -> [SKIP][16] ([i915#8502]) +3 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-rkl-7/igt@kms_async_flips@async-flip-with-page-flip-events@pipe-b-hdmi-a-1-y-rc_ccs.html
* igt@kms_ccs@pipe-a-bad-pixel-format-y_tiled_gen12_mc_ccs:
- shard-apl: NOTRUN -> [SKIP][17] ([fdo#109271] / [i915#3886])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-apl3/igt@kms_ccs@pipe-a-bad-pixel-format-y_tiled_gen12_mc_ccs.html
- shard-glk: NOTRUN -> [SKIP][18] ([fdo#109271] / [i915#3886])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-glk7/igt@kms_ccs@pipe-a-bad-pixel-format-y_tiled_gen12_mc_ccs.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-glk: NOTRUN -> [FAIL][19] ([i915#2346])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-glk7/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
- shard-apl: NOTRUN -> [FAIL][20] ([i915#2346])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-apl3/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
* igt@kms_flip@flip-vs-suspend@a-dp1:
- shard-apl: [PASS][21] -> [ABORT][22] ([i915#180])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/shard-apl2/igt@kms_flip@flip-vs-suspend@a-dp1.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-apl3/igt@kms_flip@flip-vs-suspend@a-dp1.html
* igt@kms_flip_scaled_crc@flip-32bpp-4tile-to-64bpp-4tile-upscaling@pipe-a-valid-mode:
- shard-apl: NOTRUN -> [SKIP][23] ([fdo#109271] / [i915#4579])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-apl3/igt@kms_flip_scaled_crc@flip-32bpp-4tile-to-64bpp-4tile-upscaling@pipe-a-valid-mode.html
- shard-glk: NOTRUN -> [SKIP][24] ([fdo#109271] / [i915#4579])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-glk7/igt@kms_flip_scaled_crc@flip-32bpp-4tile-to-64bpp-4tile-upscaling@pipe-a-valid-mode.html
* igt@kms_frontbuffer_tracking@psr-modesetfrombusy:
- shard-apl: NOTRUN -> [SKIP][25] ([fdo#109271]) +14 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-apl3/igt@kms_frontbuffer_tracking@psr-modesetfrombusy.html
* igt@kms_plane_scaling@intel-max-src-size@pipe-a-hdmi-a-2:
- shard-rkl: NOTRUN -> [FAIL][26] ([i915#8292])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-rkl-6/igt@kms_plane_scaling@intel-max-src-size@pipe-a-hdmi-a-2.html
* igt@kms_plane_scaling@plane-downscale-with-modifiers-factor-0-25@pipe-a-hdmi-a-1:
- shard-rkl: NOTRUN -> [SKIP][27] ([i915#5176]) +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-rkl-7/igt@kms_plane_scaling@plane-downscale-with-modifiers-factor-0-25@pipe-a-hdmi-a-1.html
- shard-snb: NOTRUN -> [SKIP][28] ([fdo#109271]) +13 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-snb1/igt@kms_plane_scaling@plane-downscale-with-modifiers-factor-0-25@pipe-a-hdmi-a-1.html
* igt@kms_plane_scaling@plane-downscale-with-rotation-factor-0-25@pipe-b-hdmi-a-2:
- shard-rkl: NOTRUN -> [SKIP][29] ([i915#4579] / [i915#5176]) +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-rkl-1/igt@kms_plane_scaling@plane-downscale-with-rotation-factor-0-25@pipe-b-hdmi-a-2.html
* igt@kms_plane_scaling@planes-downscale-factor-0-25-upscale-20x20@pipe-b-hdmi-a-2:
- shard-rkl: NOTRUN -> [SKIP][30] ([i915#4579] / [i915#5235]) +3 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-rkl-1/igt@kms_plane_scaling@planes-downscale-factor-0-25-upscale-20x20@pipe-b-hdmi-a-2.html
* igt@kms_plane_scaling@planes-unity-scaling-downscale-factor-0-25@pipe-a-hdmi-a-2:
- shard-rkl: NOTRUN -> [SKIP][31] ([i915#5235]) +3 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-rkl-6/igt@kms_plane_scaling@planes-unity-scaling-downscale-factor-0-25@pipe-a-hdmi-a-2.html
* igt@kms_setmode@basic@pipe-a-vga-1:
- shard-snb: NOTRUN -> [FAIL][32] ([i915#5465]) +1 similar issue
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-snb5/igt@kms_setmode@basic@pipe-a-vga-1.html
* igt@v3d/v3d_perfmon@destroy-invalid-perfmon:
- shard-glk: NOTRUN -> [SKIP][33] ([fdo#109271]) +10 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-glk7/igt@v3d/v3d_perfmon@destroy-invalid-perfmon.html
#### Possible fixes ####
* igt@drm_fdinfo@most-busy-idle-check-all@rcs0:
- shard-rkl: [FAIL][34] ([i915#7742]) -> [PASS][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/shard-rkl-4/igt@drm_fdinfo@most-busy-idle-check-all@rcs0.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-rkl-4/igt@drm_fdinfo@most-busy-idle-check-all@rcs0.html
* igt@gem_exec_fair@basic-pace@rcs0:
- shard-rkl: [FAIL][36] ([i915#2842]) -> [PASS][37] +1 similar issue
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/shard-rkl-6/igt@gem_exec_fair@basic-pace@rcs0.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-rkl-7/igt@gem_exec_fair@basic-pace@rcs0.html
* igt@gen9_exec_parse@allowed-single:
- shard-apl: [ABORT][38] ([i915#5566]) -> [PASS][39]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/shard-apl3/igt@gen9_exec_parse@allowed-single.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-apl3/igt@gen9_exec_parse@allowed-single.html
- shard-glk: [ABORT][40] ([i915#5566]) -> [PASS][41]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/shard-glk6/igt@gen9_exec_parse@allowed-single.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-glk7/igt@gen9_exec_parse@allowed-single.html
* igt@i915_pm_rpm@dpms-non-lpsp:
- shard-rkl: [SKIP][42] ([i915#1397]) -> [PASS][43] +2 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/shard-rkl-7/igt@i915_pm_rpm@dpms-non-lpsp.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-rkl-1/igt@i915_pm_rpm@dpms-non-lpsp.html
* igt@kms_cursor_legacy@forked-bo@pipe-b:
- {shard-dg1}: [INCOMPLETE][44] ([i915#8011] / [i915#8347]) -> [PASS][45]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/shard-dg1-19/igt@kms_cursor_legacy@forked-bo@pipe-b.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-dg1-15/igt@kms_cursor_legacy@forked-bo@pipe-b.html
* igt@kms_cursor_legacy@single-bo@pipe-b:
- shard-rkl: [INCOMPLETE][46] ([i915#8011]) -> [PASS][47] +1 similar issue
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/shard-rkl-7/igt@kms_cursor_legacy@single-bo@pipe-b.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-rkl-6/igt@kms_cursor_legacy@single-bo@pipe-b.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a2:
- shard-glk: [FAIL][48] ([i915#79]) -> [PASS][49]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/shard-glk9/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a2.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-glk8/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a2.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-indfb-draw-blt:
- shard-snb: [SKIP][50] ([fdo#109271]) -> [PASS][51]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/shard-snb5/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-indfb-draw-blt.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-snb1/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-indfb-draw-blt.html
#### Warnings ####
* igt@kms_multipipe_modeset@basic-max-pipe-crc-check:
- shard-rkl: [SKIP][52] ([i915#4070] / [i915#4816]) -> [SKIP][53] ([i915#4816])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13278/shard-rkl-6/igt@kms_multipipe_modeset@basic-max-pipe-crc-check.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/shard-rkl-7/igt@kms_multipipe_modeset@basic-max-pipe-crc-check.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#3778]: https://gitlab.freedesktop.org/drm/intel/issues/3778
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3989]: https://gitlab.freedesktop.org/drm/intel/issues/3989
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4816]: https://gitlab.freedesktop.org/drm/intel/issues/4816
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5465]: https://gitlab.freedesktop.org/drm/intel/issues/5465
[i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566
[i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268
[i915#7392]: https://gitlab.freedesktop.org/drm/intel/issues/7392
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#7921]: https://gitlab.freedesktop.org/drm/intel/issues/7921
[i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011
[i915#8292]: https://gitlab.freedesktop.org/drm/intel/issues/8292
[i915#8347]: https://gitlab.freedesktop.org/drm/intel/issues/8347
[i915#8502]: https://gitlab.freedesktop.org/drm/intel/issues/8502
Build changes
-------------
* Linux: CI_DRM_13278 -> Patchwork_119441v1
CI-20190529: 20190529
CI_DRM_13278: 3c942541e24c0aaab070d498c57647e7b4e9aa6e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7334: 9dd259184050af3e5217e1a63e6b90b1b946e7c4 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_119441v1: 3c942541e24c0aaab070d498c57647e7b4e9aa6e @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119441v1/index.html
[-- Attachment #2: Type: text/html, Size: 17335 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: make i915_drm_client_fdinfo() reference conditional again
2023-06-16 9:31 [Intel-gfx] [PATCH] drm/i915: make i915_drm_client_fdinfo() reference conditional again Arnd Bergmann
` (4 preceding siblings ...)
2023-06-16 16:18 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
@ 2023-06-17 0:44 ` Randy Dunlap
5 siblings, 0 replies; 10+ messages in thread
From: Randy Dunlap @ 2023-06-17 0:44 UTC (permalink / raw)
To: Arnd Bergmann, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
Tvrtko Ursulin, David Airlie, Daniel Vetter, Andi Shyti
Cc: Arnd Bergmann, Alan Previn, Lucas De Marchi, linux-kernel,
dri-devel, Matt Roper, intel-gfx
On 6/16/23 02:31, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> The function is only defined if CONFIG_PROC_FS is enabled:
>
> ld.lld: error: undefined symbol: i915_drm_client_fdinfo
>>>> referenced by i915_driver.c
>>>> drivers/gpu/drm/i915/i915_driver.o:(i915_drm_driver) in archive vmlinux.a
>
> Use the PTR_IF() helper to make the reference NULL otherwise.
>
> Fixes: e894b724c316d ("drm/i915: Use the fdinfo helper")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Thanks.
> ---
> drivers/gpu/drm/i915/i915_driver.c | 2 +-
> drivers/gpu/drm/i915/i915_drm_client.h | 2 --
> 2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index 75cbc43b326dd..0ad0c5885ec27 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -1816,7 +1816,7 @@ static const struct drm_driver i915_drm_driver = {
> .open = i915_driver_open,
> .lastclose = i915_driver_lastclose,
> .postclose = i915_driver_postclose,
> - .show_fdinfo = i915_drm_client_fdinfo,
> + .show_fdinfo = PTR_IF(IS_ENABLED(CONFIG_PROC_FS), i915_drm_client_fdinfo),
>
> .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
> .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
> diff --git a/drivers/gpu/drm/i915/i915_drm_client.h b/drivers/gpu/drm/i915/i915_drm_client.h
> index 4c18b99e10a4e..67816c912bca1 100644
> --- a/drivers/gpu/drm/i915/i915_drm_client.h
> +++ b/drivers/gpu/drm/i915/i915_drm_client.h
> @@ -47,8 +47,6 @@ static inline void i915_drm_client_put(struct i915_drm_client *client)
>
> struct i915_drm_client *i915_drm_client_alloc(void);
>
> -#ifdef CONFIG_PROC_FS
> void i915_drm_client_fdinfo(struct drm_printer *p, struct drm_file *file);
> -#endif
>
> #endif /* !__I915_DRM_CLIENT_H__ */
--
~Randy
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: make i915_drm_client_fdinfo() reference conditional again
2023-06-16 11:17 ` Tvrtko Ursulin
@ 2023-06-19 9:04 ` Andi Shyti
2023-06-19 9:11 ` Tvrtko Ursulin
1 sibling, 0 replies; 10+ messages in thread
From: Andi Shyti @ 2023-06-19 9:04 UTC (permalink / raw)
To: Tvrtko Ursulin
Cc: Arnd Bergmann, Daniel Vetter, Arnd Bergmann, Matt Roper,
Lucas De Marchi, linux-kernel, Alan Previn, dri-devel,
Rodrigo Vivi, David Airlie, intel-gfx
Hi Tvrtko,
On Fri, Jun 16, 2023 at 12:17:50PM +0100, Tvrtko Ursulin wrote:
>
> On 16/06/2023 11:16, Andi Shyti wrote:
> > Hi Arnd,
> >
> > On Fri, Jun 16, 2023 at 11:31:47AM +0200, Arnd Bergmann wrote:
> > > From: Arnd Bergmann <arnd@arndb.de>
> > >
> > > The function is only defined if CONFIG_PROC_FS is enabled:
> > >
> > > ld.lld: error: undefined symbol: i915_drm_client_fdinfo
> > > > > > referenced by i915_driver.c
> > > > > > drivers/gpu/drm/i915/i915_driver.o:(i915_drm_driver) in archive vmlinux.a
> > >
> > > Use the PTR_IF() helper to make the reference NULL otherwise.
> > >
> > > Fixes: e894b724c316d ("drm/i915: Use the fdinfo helper")
> > > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > > ---
> > > drivers/gpu/drm/i915/i915_driver.c | 2 +-
> > > drivers/gpu/drm/i915/i915_drm_client.h | 2 --
> > > 2 files changed, 1 insertion(+), 3 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> > > index 75cbc43b326dd..0ad0c5885ec27 100644
> > > --- a/drivers/gpu/drm/i915/i915_driver.c
> > > +++ b/drivers/gpu/drm/i915/i915_driver.c
> > > @@ -1816,7 +1816,7 @@ static const struct drm_driver i915_drm_driver = {
> > > .open = i915_driver_open,
> > > .lastclose = i915_driver_lastclose,
> > > .postclose = i915_driver_postclose,
> > > - .show_fdinfo = i915_drm_client_fdinfo,
> > > + .show_fdinfo = PTR_IF(IS_ENABLED(CONFIG_PROC_FS), i915_drm_client_fdinfo),
> > > .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
> > > .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
> > > diff --git a/drivers/gpu/drm/i915/i915_drm_client.h b/drivers/gpu/drm/i915/i915_drm_client.h
> > > index 4c18b99e10a4e..67816c912bca1 100644
> > > --- a/drivers/gpu/drm/i915/i915_drm_client.h
> > > +++ b/drivers/gpu/drm/i915/i915_drm_client.h
> > > @@ -47,8 +47,6 @@ static inline void i915_drm_client_put(struct i915_drm_client *client)
> > > struct i915_drm_client *i915_drm_client_alloc(void);
> > > -#ifdef CONFIG_PROC_FS
> > > void i915_drm_client_fdinfo(struct drm_printer *p, struct drm_file *file);
> > > -#endif
> >
> > nice! This is becoming the new trend now.
> >
> > Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
>
> Thanks for the fix and review! (And I got to learn about existence of PTR_IF
> too.)
>
> Andi will you merge once green or should I?
will do! Thanks!
Andi
> Regards,
>
> Tvrtko
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: make i915_drm_client_fdinfo() reference conditional again
2023-06-16 11:17 ` Tvrtko Ursulin
2023-06-19 9:04 ` Andi Shyti
@ 2023-06-19 9:11 ` Tvrtko Ursulin
1 sibling, 0 replies; 10+ messages in thread
From: Tvrtko Ursulin @ 2023-06-19 9:11 UTC (permalink / raw)
To: Andi Shyti, Arnd Bergmann
Cc: Alan Previn, Arnd Bergmann, Matt Roper, Lucas De Marchi,
linux-kernel, dri-devel, Daniel Vetter, Rodrigo Vivi,
David Airlie, intel-gfx
On 16/06/2023 12:17, Tvrtko Ursulin wrote:
>
> On 16/06/2023 11:16, Andi Shyti wrote:
>> Hi Arnd,
>>
>> On Fri, Jun 16, 2023 at 11:31:47AM +0200, Arnd Bergmann wrote:
>>> From: Arnd Bergmann <arnd@arndb.de>
>>>
>>> The function is only defined if CONFIG_PROC_FS is enabled:
>>>
>>> ld.lld: error: undefined symbol: i915_drm_client_fdinfo
>>>>>> referenced by i915_driver.c
>>>>>>
>>>>>> drivers/gpu/drm/i915/i915_driver.o:(i915_drm_driver) in archive
>>>>>> vmlinux.a
>>>
>>> Use the PTR_IF() helper to make the reference NULL otherwise.
>>>
>>> Fixes: e894b724c316d ("drm/i915: Use the fdinfo helper")
>>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>>> ---
>>> drivers/gpu/drm/i915/i915_driver.c | 2 +-
>>> drivers/gpu/drm/i915/i915_drm_client.h | 2 --
>>> 2 files changed, 1 insertion(+), 3 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/i915_driver.c
>>> b/drivers/gpu/drm/i915/i915_driver.c
>>> index 75cbc43b326dd..0ad0c5885ec27 100644
>>> --- a/drivers/gpu/drm/i915/i915_driver.c
>>> +++ b/drivers/gpu/drm/i915/i915_driver.c
>>> @@ -1816,7 +1816,7 @@ static const struct drm_driver i915_drm_driver = {
>>> .open = i915_driver_open,
>>> .lastclose = i915_driver_lastclose,
>>> .postclose = i915_driver_postclose,
>>> - .show_fdinfo = i915_drm_client_fdinfo,
>>> + .show_fdinfo = PTR_IF(IS_ENABLED(CONFIG_PROC_FS),
>>> i915_drm_client_fdinfo),
>>> .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
>>> .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
>>> diff --git a/drivers/gpu/drm/i915/i915_drm_client.h
>>> b/drivers/gpu/drm/i915/i915_drm_client.h
>>> index 4c18b99e10a4e..67816c912bca1 100644
>>> --- a/drivers/gpu/drm/i915/i915_drm_client.h
>>> +++ b/drivers/gpu/drm/i915/i915_drm_client.h
>>> @@ -47,8 +47,6 @@ static inline void i915_drm_client_put(struct
>>> i915_drm_client *client)
>>> struct i915_drm_client *i915_drm_client_alloc(void);
>>> -#ifdef CONFIG_PROC_FS
>>> void i915_drm_client_fdinfo(struct drm_printer *p, struct drm_file
>>> *file);
>>> -#endif
>>
>> nice! This is becoming the new trend now.
>>
>> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
>
> Thanks for the fix and review! (And I got to learn about existence of
> PTR_IF too.)
>
> Andi will you merge once green or should I?
Pushed, thanks for the fixup and review!
Regards,
Tvrtko
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-06-19 9:12 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-16 9:31 [Intel-gfx] [PATCH] drm/i915: make i915_drm_client_fdinfo() reference conditional again Arnd Bergmann
2023-06-16 10:16 ` Andi Shyti
2023-06-16 11:17 ` Tvrtko Ursulin
2023-06-19 9:04 ` Andi Shyti
2023-06-19 9:11 ` Tvrtko Ursulin
2023-06-16 13:23 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2023-06-16 13:23 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2023-06-16 13:32 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-06-16 16:18 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2023-06-17 0:44 ` [Intel-gfx] [PATCH] " Randy Dunlap
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox