Skip to contentSkip to conversation

drm/panel: make drm_panel.h self-contained

PATCH In review Jani Nikula 4 participants 5 messages Jun 27, 2019 – Aug 1, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/panel: make drm_panel.h self-contained

Fix build warning if drm_panel.h is built with CONFIG_OF=n or CONFIG_DRM_PANEL=n and included without the prerequisite err.h:

./include/drm/drm_panel.h: In function ‘of_drm_find_panel’:
./include/drm/drm_panel.h:203:9: error: implicit declaration of function ‘ERR_PTR’ [-Werror=implicit-function-declaration]

  return ERR_PTR(-ENODEV);
         ^~~~~~~
./include/drm/drm_panel.h:203:9: error: returning ‘int’ from a function with return type ‘struct drm_panel *’ makes pointer from integer without a cast [-Werror=int-conversion]
  return ERR_PTR(-ENODEV);
         ^~~~~~~~~~~~~~~~
Fixes 5fa8e4a22182 ("drm/panel: Make of_drm_find_panel() return an ERR_PTR() instead of NULL")
Cc Boris Brezillon <[email protected]>
Cc Thierry Reding <[email protected]>

---

I don't know if there's a combo where this actually fails, so I'm not adding cc: stable. It's just something I hit when playing with other code.

---
 include/drm/drm_panel.h | 1 +
 1 file changed, 1 insertion(+)
include/drm/drm_panel.h +1 -0
index 8c738c0e6e9f..26377836141c 100644
@@ -24,6 +24,7 @@
 #ifndef __DRM_PANEL_H__
 #define __DRM_PANEL_H__
 
+#include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/list.h>
 
Signature · 6 lines
2.20.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Acked-by on v1 1/1
#1 lore raw
Quoted 16 lines · Jani Nikula

Fix build warning if drm_panel.h is built with CONFIG_OF=n or CONFIG_DRM_PANEL=n and included without the prerequisite err.h:

./include/drm/drm_panel.h: In function ‘of_drm_find_panel’:
./include/drm/drm_panel.h:203:9: error: implicit declaration of function ‘ERR_PTR’ [-Werror=implicit-function-declaration]

  return ERR_PTR(-ENODEV);
         ^~~~~~~
./include/drm/drm_panel.h:203:9: error: returning ‘int’ from a function with return type ‘struct drm_panel *’ makes pointer from integer without a cast [-Werror=int-conversion]
  return ERR_PTR(-ENODEV);
         ^~~~~~~~~~~~~~~~
Fixes 5fa8e4a22182 ("drm/panel: Make of_drm_find_panel() return an ERR_PTR() instead of NULL")
Cc Boris Brezillon <[email protected]>
Cc Thierry Reding <[email protected]>
Quoted 8 lines

---

I don't know if there's a combo where this actually fails, so I'm not adding cc: stable. It's just something I hit when playing with other code.

---
 include/drm/drm_panel.h | 1 +
 1 file changed, 1 insertion(+)

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

✗ Fi.CI.BAT: failure for drm/panel: make drm_panel.h self-contained

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/panel: make drm_panel.h self-contained
URL : https://patchwork.freedesktop.org/series/62850/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_6375 -> Patchwork_13454
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_13454 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_13454, 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_13454/

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

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

### IGT changes ###

#### Possible regressions ####

* igt@i915_pm_rpm@basic-rte:
- fi-skl-6600u: NOTRUN -> [DMESG-WARN][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13454/fi-skl-6600u/igt@[email protected]

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

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

### IGT changes ###

#### Issues hit ####

* igt@gem_exec_reloc@basic-cpu:
- fi-icl-u3: [PASS][2] -> [DMESG-WARN][3] ([fdo#107724]) +1 similar issue
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6375/fi-icl-u3/igt@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13454/fi-icl-u3/igt@[email protected]

* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: [PASS][4] -> [DMESG-WARN][5] ([fdo#102614])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6375/fi-hsw-peppy/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13454/fi-hsw-peppy/igt@[email protected]

* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- fi-blb-e6850: [PASS][6] -> [INCOMPLETE][7] ([fdo#107718])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6375/fi-blb-e6850/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13454/fi-blb-e6850/igt@[email protected]

#### Possible fixes ####

* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7567u: [WARN][8] ([fdo#109380]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6375/fi-kbl-7567u/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13454/fi-kbl-7567u/igt@[email protected]

* igt@kms_frontbuffer_tracking@basic:
- fi-icl-u2: [FAIL][10] ([fdo#103167]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6375/fi-icl-u2/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13454/fi-icl-u2/igt@[email protected]

* igt@kms_pipe_crc_basic@read-crc-pipe-c:
- fi-kbl-7567u: [SKIP][12] ([fdo#109271]) -> [PASS][13] +23 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6375/fi-kbl-7567u/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13454/fi-kbl-7567u/igt@[email protected]

* igt@prime_self_import@basic-with_two_bos:
- fi-icl-u3: [DMESG-WARN][14] ([fdo#107724]) -> [PASS][15] +1 similar issue
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6375/fi-icl-u3/igt@prime_self_import@basic-with_two_bos.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13454/fi-icl-u3/igt@prime_self_import@basic-with_two_bos.html

#### Warnings ####

* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-kbl-guc: [FAIL][16] ([fdo#110829]) -> [SKIP][17] ([fdo#109271])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6375/fi-kbl-guc/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13454/fi-kbl-guc/igt@[email protected]

[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109380]: https://bugs.freedesktop.org/show_bug.cgi?id=109380
[fdo#110829]: https://bugs.freedesktop.org/show_bug.cgi?id=110829

Participating hosts (53 -> 45)
------------------------------

Additional (1): fi-skl-6600u
Missing (9): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper fi-icl-y fi-icl-dsi fi-bdw-samus

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

* Linux: CI_DRM_6375 -> Patchwork_13454

CI_DRM_6375: 44b3a556c682d3ae6d1cf94f6ec7c155ebeeff50 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5070: 250475af7bc52ba64956e6b35591fdd7176954d7 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13454: da55abb57ca67d3a115151f1154505ee8eda2d6e @ git://anongit.freedesktop.org/gfx-ci/linux

== Kernel 32bit build ==

Warning: Kernel 32bit buildtest failed:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13454/build_32bit.log

  CALL    scripts/checksyscalls.sh
  CALL    scripts/atomic/check-atomics.sh
  CHK     include/generated/compile.h

Kernel: arch/x86/boot/bzImage is ready (#1)
Building modules, stage 2.
MODPOST 112 modules
ERROR: "__udivdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: "__divdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! scripts/Makefile.modpost:91: recipe for target '__modpost' failed make[1]: *** [__modpost] Error 1
Makefile:1287: recipe for target 'modules' failed
make: *** [modules] Error 2

== Linux commits ==

da55abb57ca6 drm/panel: make drm_panel.h self-contained

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13454/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/1
#3 lore raw
In reply to Jani Nikula

Hi Jani.

Quoted 11 lines · Jani Nikula

Fix build warning if drm_panel.h is built with CONFIG_OF=n or CONFIG_DRM_PANEL=n and included without the prerequisite err.h:

./include/drm/drm_panel.h: In function ‘of_drm_find_panel’:
./include/drm/drm_panel.h:203:9: error: implicit declaration of function ‘ERR_PTR’ [-Werror=implicit-function-declaration]

  return ERR_PTR(-ENODEV);
         ^~~~~~~
./include/drm/drm_panel.h:203:9: error: returning ‘int’ from a function with return type ‘struct drm_panel *’ makes pointer from integer without a cast [-Werror=int-conversion]
  return ERR_PTR(-ENODEV);
         ^~~~~~~~~~~~~~~~
Quoted 4 lines
Fixes 5fa8e4a22182 ("drm/panel: Make of_drm_find_panel() return an ERR_PTR() instead of NULL")
Cc Boris Brezillon <[email protected]>
Cc Thierry Reding <[email protected]>

When we start to deploy headers-test I expect us to find many more of this class of issues.
But lets get them fixed so we do not see sporadic build errors due to missing dependencies in the header files.

I assume you will commit the fix.

Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#4 lore raw
Quoted 18 lines · Sam Ravnborg

Hi Jani.

Quoted 11 lines · Jani Nikula

Fix build warning if drm_panel.h is built with CONFIG_OF=n or CONFIG_DRM_PANEL=n and included without the prerequisite err.h:

./include/drm/drm_panel.h: In function ‘of_drm_find_panel’:
./include/drm/drm_panel.h:203:9: error: implicit declaration of function ‘ERR_PTR’ [-Werror=implicit-function-declaration]

  return ERR_PTR(-ENODEV);
         ^~~~~~~
./include/drm/drm_panel.h:203:9: error: returning ‘int’ from a function with return type ‘struct drm_panel *’ makes pointer from integer without a cast [-Werror=int-conversion]
  return ERR_PTR(-ENODEV);
         ^~~~~~~~~~~~~~~~
Quoted 4 lines
Fixes 5fa8e4a22182 ("drm/panel: Make of_drm_find_panel() return an ERR_PTR() instead of NULL")
Cc Boris Brezillon <[email protected]>
Cc Thierry Reding <[email protected]>
Quoted 8 lines

When we start to deploy headers-test I expect us to find many more of this class of issues.
But lets get them fixed so we do not see sporadic build errors due to missing dependencies in the header files.

I assume you will commit the fix.

Thanks for picking up the ball I dropped, and committing this!

BR,
Jani.

Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx