Skip to contentSkip to conversation

drm/i915: add intel_opregion_vbt_present() stub function

PATCH In review Arnd Bergmann 3 participants 5 messages Mar 13, 2024

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

PATCH 1/1 drm/i915: add intel_opregion_vbt_present() stub function

From: Arnd Bergmann <[email protected]>

The newly added function is not available without CONFIG_ACPI, causing a build failure:

drivers/gpu/drm/i915/display/intel_bios.c:3424:24: error: implicit declaration of function 'intel_opregion_vbt_present'; did you mean 'intel_opregion_asle_present'? [-Werror=implicit-function-declaration]

Add an empty stub in the same place as the other stubs.

Fixes 9d9bb71f3e11 ("drm/i915: Extract opregion vbt presence check")
---
 drivers/gpu/drm/i915/display/intel_opregion.h | 5 +++++
 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/display/intel_opregion.h +5 -0
index 63573c38d735..4b2b8e752632 100644
@@ -120,6 +120,11 @@ intel_opregion_get_edid(struct intel_connector *connector)
 	return NULL;
 }
 
+static inline bool intel_opregion_vbt_present(struct drm_i915_private *i915)
+{
+	return false;
+}
+
 static inline const void *
 intel_opregion_get_vbt(struct drm_i915_private *i915, size_t *size)
 {
Signature · 1 line
2.39.2
#1 lore raw

✗ CI.Patch_applied: failure for drm/i915: add intel_opregion_vbt_present() stub function

== Series Details ==

== Series Details ==

Series: drm/i915: add intel_opregion_vbt_present() stub function
URL : https://patchwork.freedesktop.org/series/131062/
State : failure

== Summary ==

=== Applying kernel patches on branch 'drm-tip' with base: ===
Base commit: 66de9026cd45 drm-tip: 2024y-03m-13d-08h-34m-34s UTC integration manifest === git am output follows ===
error: patch failed: drivers/gpu/drm/i915/display/intel_opregion.h:120
error: drivers/gpu/drm/i915/display/intel_opregion.h: patch does not apply
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Applying: drm/i915: add intel_opregion_vbt_present() stub function Patch failed at 0001 drm/i915: add intel_opregion_vbt_present() stub function When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

maintainer
#2 lore raw
In reply to Arnd Bergmann
Quoted 11 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

The newly added function is not available without CONFIG_ACPI, causing a build failure:

drivers/gpu/drm/i915/display/intel_bios.c:3424:24: error: implicit declaration of function 'intel_opregion_vbt_present'; did you mean 'intel_opregion_asle_present'? [-Werror=implicit-function-declaration]

Add an empty stub in the same place as the other stubs.

Fixes 9d9bb71f3e11 ("drm/i915: Extract opregion vbt presence check")

Thanks, but just applied the identical [1].

BR,
Jani.

[1] https://lore.kernel.org/r/[email protected]

Quoted 20 lines
---
 drivers/gpu/drm/i915/display/intel_opregion.h | 5 +++++
 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/display/intel_opregion.h +5 -0
index 63573c38d735..4b2b8e752632 100644
@@ -120,6 +120,11 @@ intel_opregion_get_edid(struct intel_connector *connector)
 	return NULL;
 }
 
+static inline bool intel_opregion_vbt_present(struct drm_i915_private *i915)
+{
+	return false;
+}
+
 static inline const void *
 intel_opregion_get_vbt(struct drm_i915_private *i915, size_t *size)
 {
Signature · 1 line
Jani Nikula, Intel
#4 lore raw

✗ Fi.CI.BAT: failure for drm/i915: add intel_opregion_vbt_present() stub function

In reply to Arnd Bergmann
== Series Details ==

== Series Details ==

Series: drm/i915: add intel_opregion_vbt_present() stub function
URL : https://patchwork.freedesktop.org/series/131060/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_14426 -> Patchwork_131060v1
====================================================

Summary
-------

**FAILURE**

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

If you think the reported changes have nothing to do with the changes
introduced in Patchwork_131060v1, please notify your bug team ([email protected]) 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_131060v1/index.html

Participating hosts (35 -> 34)
------------------------------

Missing (1): fi-snb-2520m

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

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

### IGT changes ###

#### Possible regressions ####

* igt@i915_selftest@live@gt_lrc:
- bat-arls-2: [PASS][1] -> [ABORT][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14426/bat-arls-2/igt@i915_selftest@live@gt_lrc.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131060v1/bat-arls-2/igt@i915_selftest@live@gt_lrc.html

* igt@vgem_basic@unload:
- fi-elk-e7500: [PASS][3] -> [INCOMPLETE][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14426/fi-elk-e7500/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131060v1/fi-elk-e7500/igt@[email protected]

#### Suppressed ####

The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.

* igt@i915_module_load@load:
- {bat-mtlp-9}: [PASS][5] -> [ABORT][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14426/bat-mtlp-9/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131060v1/bat-mtlp-9/igt@[email protected]

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

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

### CI changes ###

#### Issues hit ####

* boot:
- bat-jsl-1: [PASS][7] -> [FAIL][8] ([i915#8293])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14426/bat-jsl-1/boot.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131060v1/bat-jsl-1/boot.html

### IGT changes ###

#### Issues hit ####

* igt@i915_module_load@reload:
- fi-kbl-7567u: [PASS][9] -> [DMESG-WARN][10] ([i915#1982])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14426/fi-kbl-7567u/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131060v1/fi-kbl-7567u/igt@[email protected]

* igt@i915_selftest@live@hangcheck:
- bat-rpls-3: [PASS][11] -> [DMESG-WARN][12] ([i915#5591])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14426/bat-rpls-3/igt@i915_selftest@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131060v1/bat-rpls-3/igt@i915_selftest@[email protected]

* igt@i915_selftest@live@vma:
- bat-dg2-14: [PASS][13] -> [ABORT][14] ([i915#10366])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14426/bat-dg2-14/igt@i915_selftest@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131060v1/bat-dg2-14/igt@i915_selftest@[email protected]

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

[i915#10366]: https://gitlab.freedesktop.org/drm/intel/issues/10366
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#5591]: https://gitlab.freedesktop.org/drm/intel/issues/5591
[i915#8293]: https://gitlab.freedesktop.org/drm/intel/issues/8293

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

* Linux: CI_DRM_14426 -> Patchwork_131060v1

CI-20190529: 20190529
CI_DRM_14426: 72f447f984cf5526e6ad32a6e2770124c67d59d3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7759: 7759
Patchwork_131060v1: 72f447f984cf5526e6ad32a6e2770124c67d59d3 @ git://anongit.freedesktop.org/gfx-ci/linux

### Linux commits

== Logs ==

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