* [PATCH] drm/i915/rom: convert intel_rom interfaces to struct drm_device
@ 2025-10-23 7:35 Jani Nikula
2025-10-23 8:50 ` ✗ i915.CI.BAT: failure for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Jani Nikula @ 2025-10-23 7:35 UTC (permalink / raw)
To: intel-gfx, intel-xe; +Cc: jani.nikula
Reduce the display dependency on struct drm_i915_private and i915_drv.h
by converting the rom interface to struct drm_device.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_bios.c | 7 +++----
drivers/gpu/drm/i915/soc/intel_rom.c | 7 ++++---
drivers/gpu/drm/i915/soc/intel_rom.h | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 3596dce84c28..246c6fb0f09a 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -32,10 +32,10 @@
#include <drm/display/drm_dsc_helper.h>
#include <drm/drm_edid.h>
#include <drm/drm_fixed.h>
+#include <drm/drm_print.h>
#include "soc/intel_rom.h"
-#include "i915_drv.h"
#include "i915_utils.h"
#include "intel_display.h"
#include "intel_display_core.h"
@@ -3144,7 +3144,6 @@ static struct vbt_header *oprom_get_vbt(struct intel_display *display,
static const struct vbt_header *intel_bios_get_vbt(struct intel_display *display,
size_t *sizep)
{
- struct drm_i915_private *i915 = to_i915(display->drm);
const struct vbt_header *vbt = NULL;
vbt = firmware_get_vbt(display, sizep);
@@ -3158,11 +3157,11 @@ static const struct vbt_header *intel_bios_get_vbt(struct intel_display *display
*/
if (!vbt && display->platform.dgfx)
with_intel_display_rpm(display)
- vbt = oprom_get_vbt(display, intel_rom_spi(i915), sizep, "SPI flash");
+ vbt = oprom_get_vbt(display, intel_rom_spi(display->drm), sizep, "SPI flash");
if (!vbt)
with_intel_display_rpm(display)
- vbt = oprom_get_vbt(display, intel_rom_pci(i915), sizep, "PCI ROM");
+ vbt = oprom_get_vbt(display, intel_rom_pci(display->drm), sizep, "PCI ROM");
return vbt;
}
diff --git a/drivers/gpu/drm/i915/soc/intel_rom.c b/drivers/gpu/drm/i915/soc/intel_rom.c
index 243d98cab8c3..2f17dc856e7f 100644
--- a/drivers/gpu/drm/i915/soc/intel_rom.c
+++ b/drivers/gpu/drm/i915/soc/intel_rom.c
@@ -39,8 +39,9 @@ static u16 spi_read16(struct intel_rom *rom, loff_t offset)
return spi_read32(rom, offset) & 0xffff;
}
-struct intel_rom *intel_rom_spi(struct drm_i915_private *i915)
+struct intel_rom *intel_rom_spi(struct drm_device *drm)
{
+ struct drm_i915_private *i915 = to_i915(drm);
struct intel_rom *rom;
u32 static_region;
@@ -85,7 +86,7 @@ static void pci_free(struct intel_rom *rom)
pci_unmap_rom(rom->pdev, rom->oprom);
}
-struct intel_rom *intel_rom_pci(struct drm_i915_private *i915)
+struct intel_rom *intel_rom_pci(struct drm_device *drm)
{
struct intel_rom *rom;
@@ -93,7 +94,7 @@ struct intel_rom *intel_rom_pci(struct drm_i915_private *i915)
if (!rom)
return NULL;
- rom->pdev = to_pci_dev(i915->drm.dev);
+ rom->pdev = to_pci_dev(drm->dev);
rom->oprom = pci_map_rom(rom->pdev, &rom->size);
if (!rom->oprom) {
diff --git a/drivers/gpu/drm/i915/soc/intel_rom.h b/drivers/gpu/drm/i915/soc/intel_rom.h
index fb2979c8ef7f..4e59a375787e 100644
--- a/drivers/gpu/drm/i915/soc/intel_rom.h
+++ b/drivers/gpu/drm/i915/soc/intel_rom.h
@@ -8,11 +8,11 @@
#include <linux/types.h>
-struct drm_i915_private;
+struct drm_device;
struct intel_rom;
-struct intel_rom *intel_rom_spi(struct drm_i915_private *i915);
-struct intel_rom *intel_rom_pci(struct drm_i915_private *i915);
+struct intel_rom *intel_rom_spi(struct drm_device *drm);
+struct intel_rom *intel_rom_pci(struct drm_device *drm);
u32 intel_rom_read32(struct intel_rom *rom, loff_t offset);
u16 intel_rom_read16(struct intel_rom *rom, loff_t offset);
--
2.47.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* ✗ i915.CI.BAT: failure for drm/i915/rom: convert intel_rom interfaces to struct drm_device
2025-10-23 7:35 [PATCH] drm/i915/rom: convert intel_rom interfaces to struct drm_device Jani Nikula
@ 2025-10-23 8:50 ` Patchwork
2025-10-24 12:58 ` [PATCH] " Gustavo Sousa
2025-10-31 16:53 ` ✗ Fi.CI.BUILD: failure for drm/i915/rom: convert intel_rom interfaces to struct drm_device (rev2) Patchwork
2 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2025-10-23 8:50 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 5145 bytes --]
== Series Details ==
Series: drm/i915/rom: convert intel_rom interfaces to struct drm_device
URL : https://patchwork.freedesktop.org/series/156400/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_17410 -> Patchwork_156400v1
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_156400v1 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_156400v1, please notify your bug team (I915-ci-infra@lists.freedesktop.org) 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_156400v1/index.html
Participating hosts (45 -> 42)
------------------------------
Missing (3): fi-glk-j4005 fi-snb-2520m fi-skl-6600u
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_156400v1:
### IGT changes ###
#### Possible regressions ####
* igt@i915_pm_rpm@module-reload:
- bat-mtlp-6: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17410/bat-mtlp-6/igt@i915_pm_rpm@module-reload.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_156400v1/bat-mtlp-6/igt@i915_pm_rpm@module-reload.html
Known issues
------------
Here are the changes found in Patchwork_156400v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@dmabuf@all-tests:
- bat-apl-1: [PASS][3] -> [ABORT][4] ([i915#12904]) +1 other test abort
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17410/bat-apl-1/igt@dmabuf@all-tests.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_156400v1/bat-apl-1/igt@dmabuf@all-tests.html
* igt@i915_selftest@live@workarounds:
- bat-dg2-9: [PASS][5] -> [DMESG-FAIL][6] ([i915#12061]) +1 other test dmesg-fail
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17410/bat-dg2-9/igt@i915_selftest@live@workarounds.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_156400v1/bat-dg2-9/igt@i915_selftest@live@workarounds.html
- bat-dg2-11: [PASS][7] -> [DMESG-FAIL][8] ([i915#12061]) +1 other test dmesg-fail
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17410/bat-dg2-11/igt@i915_selftest@live@workarounds.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_156400v1/bat-dg2-11/igt@i915_selftest@live@workarounds.html
#### Possible fixes ####
* igt@i915_selftest@live:
- bat-mtlp-8: [DMESG-FAIL][9] ([i915#12061]) -> [PASS][10] +1 other test pass
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17410/bat-mtlp-8/igt@i915_selftest@live.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_156400v1/bat-mtlp-8/igt@i915_selftest@live.html
- bat-jsl-1: [DMESG-FAIL][11] ([i915#13774]) -> [PASS][12] +1 other test pass
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17410/bat-jsl-1/igt@i915_selftest@live.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_156400v1/bat-jsl-1/igt@i915_selftest@live.html
* igt@i915_selftest@live@workarounds:
- bat-arls-5: [DMESG-FAIL][13] ([i915#12061]) -> [PASS][14] +1 other test pass
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17410/bat-arls-5/igt@i915_selftest@live@workarounds.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_156400v1/bat-arls-5/igt@i915_selftest@live@workarounds.html
#### Warnings ####
* igt@i915_selftest@live:
- bat-atsm-1: [DMESG-FAIL][15] ([i915#12061] / [i915#13929]) -> [DMESG-FAIL][16] ([i915#12061] / [i915#14204])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17410/bat-atsm-1/igt@i915_selftest@live.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_156400v1/bat-atsm-1/igt@i915_selftest@live.html
* igt@i915_selftest@live@mman:
- bat-atsm-1: [DMESG-FAIL][17] ([i915#13929]) -> [DMESG-FAIL][18] ([i915#14204])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17410/bat-atsm-1/igt@i915_selftest@live@mman.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_156400v1/bat-atsm-1/igt@i915_selftest@live@mman.html
[i915#12061]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12061
[i915#12904]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12904
[i915#13774]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13774
[i915#13929]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13929
[i915#14204]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14204
Build changes
-------------
* Linux: CI_DRM_17410 -> Patchwork_156400v1
CI-20190529: 20190529
CI_DRM_17410: 71929a54e8bb5da291d41a931d80c6c9160073dd @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_8594: 8594
Patchwork_156400v1: 71929a54e8bb5da291d41a931d80c6c9160073dd @ git://anongit.freedesktop.org/gfx-ci/linux
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_156400v1/index.html
[-- Attachment #2: Type: text/html, Size: 6452 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915/rom: convert intel_rom interfaces to struct drm_device
2025-10-23 7:35 [PATCH] drm/i915/rom: convert intel_rom interfaces to struct drm_device Jani Nikula
2025-10-23 8:50 ` ✗ i915.CI.BAT: failure for " Patchwork
@ 2025-10-24 12:58 ` Gustavo Sousa
2025-10-31 16:53 ` ✗ Fi.CI.BUILD: failure for drm/i915/rom: convert intel_rom interfaces to struct drm_device (rev2) Patchwork
2 siblings, 0 replies; 4+ messages in thread
From: Gustavo Sousa @ 2025-10-24 12:58 UTC (permalink / raw)
To: Jani Nikula, intel-gfx, intel-xe; +Cc: jani.nikula
Quoting Jani Nikula (2025-10-23 04:35:25-03:00)
>Reduce the display dependency on struct drm_i915_private and i915_drv.h
>by converting the rom interface to struct drm_device.
>
>Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
>---
> drivers/gpu/drm/i915/display/intel_bios.c | 7 +++----
> drivers/gpu/drm/i915/soc/intel_rom.c | 7 ++++---
> drivers/gpu/drm/i915/soc/intel_rom.h | 6 +++---
> 3 files changed, 10 insertions(+), 10 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
>index 3596dce84c28..246c6fb0f09a 100644
>--- a/drivers/gpu/drm/i915/display/intel_bios.c
>+++ b/drivers/gpu/drm/i915/display/intel_bios.c
>@@ -32,10 +32,10 @@
> #include <drm/display/drm_dsc_helper.h>
> #include <drm/drm_edid.h>
> #include <drm/drm_fixed.h>
>+#include <drm/drm_print.h>
>
> #include "soc/intel_rom.h"
>
>-#include "i915_drv.h"
> #include "i915_utils.h"
> #include "intel_display.h"
> #include "intel_display_core.h"
>@@ -3144,7 +3144,6 @@ static struct vbt_header *oprom_get_vbt(struct intel_display *display,
> static const struct vbt_header *intel_bios_get_vbt(struct intel_display *display,
> size_t *sizep)
> {
>- struct drm_i915_private *i915 = to_i915(display->drm);
> const struct vbt_header *vbt = NULL;
>
> vbt = firmware_get_vbt(display, sizep);
>@@ -3158,11 +3157,11 @@ static const struct vbt_header *intel_bios_get_vbt(struct intel_display *display
> */
> if (!vbt && display->platform.dgfx)
> with_intel_display_rpm(display)
>- vbt = oprom_get_vbt(display, intel_rom_spi(i915), sizep, "SPI flash");
>+ vbt = oprom_get_vbt(display, intel_rom_spi(display->drm), sizep, "SPI flash");
>
> if (!vbt)
> with_intel_display_rpm(display)
>- vbt = oprom_get_vbt(display, intel_rom_pci(i915), sizep, "PCI ROM");
>+ vbt = oprom_get_vbt(display, intel_rom_pci(display->drm), sizep, "PCI ROM");
>
> return vbt;
> }
>diff --git a/drivers/gpu/drm/i915/soc/intel_rom.c b/drivers/gpu/drm/i915/soc/intel_rom.c
>index 243d98cab8c3..2f17dc856e7f 100644
>--- a/drivers/gpu/drm/i915/soc/intel_rom.c
>+++ b/drivers/gpu/drm/i915/soc/intel_rom.c
>@@ -39,8 +39,9 @@ static u16 spi_read16(struct intel_rom *rom, loff_t offset)
> return spi_read32(rom, offset) & 0xffff;
> }
>
>-struct intel_rom *intel_rom_spi(struct drm_i915_private *i915)
>+struct intel_rom *intel_rom_spi(struct drm_device *drm)
> {
>+ struct drm_i915_private *i915 = to_i915(drm);
> struct intel_rom *rom;
> u32 static_region;
>
>@@ -85,7 +86,7 @@ static void pci_free(struct intel_rom *rom)
> pci_unmap_rom(rom->pdev, rom->oprom);
> }
>
>-struct intel_rom *intel_rom_pci(struct drm_i915_private *i915)
>+struct intel_rom *intel_rom_pci(struct drm_device *drm)
> {
> struct intel_rom *rom;
>
>@@ -93,7 +94,7 @@ struct intel_rom *intel_rom_pci(struct drm_i915_private *i915)
> if (!rom)
> return NULL;
>
>- rom->pdev = to_pci_dev(i915->drm.dev);
>+ rom->pdev = to_pci_dev(drm->dev);
>
> rom->oprom = pci_map_rom(rom->pdev, &rom->size);
> if (!rom->oprom) {
>diff --git a/drivers/gpu/drm/i915/soc/intel_rom.h b/drivers/gpu/drm/i915/soc/intel_rom.h
>index fb2979c8ef7f..4e59a375787e 100644
>--- a/drivers/gpu/drm/i915/soc/intel_rom.h
>+++ b/drivers/gpu/drm/i915/soc/intel_rom.h
>@@ -8,11 +8,11 @@
>
> #include <linux/types.h>
>
>-struct drm_i915_private;
>+struct drm_device;
> struct intel_rom;
>
>-struct intel_rom *intel_rom_spi(struct drm_i915_private *i915);
>-struct intel_rom *intel_rom_pci(struct drm_i915_private *i915);
>+struct intel_rom *intel_rom_spi(struct drm_device *drm);
>+struct intel_rom *intel_rom_pci(struct drm_device *drm);
>
> u32 intel_rom_read32(struct intel_rom *rom, loff_t offset);
> u16 intel_rom_read16(struct intel_rom *rom, loff_t offset);
>--
>2.47.3
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* ✗ Fi.CI.BUILD: failure for drm/i915/rom: convert intel_rom interfaces to struct drm_device (rev2)
2025-10-23 7:35 [PATCH] drm/i915/rom: convert intel_rom interfaces to struct drm_device Jani Nikula
2025-10-23 8:50 ` ✗ i915.CI.BAT: failure for " Patchwork
2025-10-24 12:58 ` [PATCH] " Gustavo Sousa
@ 2025-10-31 16:53 ` Patchwork
2 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2025-10-31 16:53 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/rom: convert intel_rom interfaces to struct drm_device (rev2)
URL : https://patchwork.freedesktop.org/series/156400/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/156400/revisions/2/mbox/ not applied
Applying: drm/i915/rom: convert intel_rom interfaces to struct drm_device
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_bios.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_bios.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_bios.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/rom: convert intel_rom interfaces to struct drm_device
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".
Build failed, no error log produced
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-10-31 16:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-10-23 7:35 [PATCH] drm/i915/rom: convert intel_rom interfaces to struct drm_device Jani Nikula
2025-10-23 8:50 ` ✗ i915.CI.BAT: failure for " Patchwork
2025-10-24 12:58 ` [PATCH] " Gustavo Sousa
2025-10-31 16:53 ` ✗ Fi.CI.BUILD: failure for drm/i915/rom: convert intel_rom interfaces to struct drm_device (rev2) Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox