* [Intel-gfx] [PATCH] drm/aperture: Pass DRM driver structure instead of driver name
@ 2021-06-29 13:58 Thomas Zimmermann
2021-06-29 14:58 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Thomas Zimmermann @ 2021-06-29 13:58 UTC (permalink / raw)
To: daniel, airlied
Cc: linux-hyperv, nouveau, intel-gfx, dri-devel, virtualization,
linux-rockchip, amd-gfx, Thomas Zimmermann, linux-arm-msm,
linux-tegra, spice-devel, linux-amlogic, freedreno, linux-sunxi,
linux-arm-kernel
Print the name of the DRM driver when taking over fbdev devices. Makes
the output to dmesg more consistent. Note that the driver name is only
used for printing a string to the kernel log. No UAPI is affected by this
change.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +-
drivers/gpu/drm/armada/armada_drv.c | 2 +-
drivers/gpu/drm/ast/ast_drv.c | 2 +-
drivers/gpu/drm/bochs/bochs_drv.c | 2 +-
drivers/gpu/drm/drm_aperture.c | 19 ++++++++++++-------
.../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 2 +-
drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 4 ++--
drivers/gpu/drm/i915/i915_drv.c | 2 +-
drivers/gpu/drm/meson/meson_drv.c | 2 +-
drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +-
drivers/gpu/drm/msm/msm_fbdev.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +-
drivers/gpu/drm/qxl/qxl_drv.c | 2 +-
drivers/gpu/drm/radeon/radeon_drv.c | 2 +-
drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +-
drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +-
drivers/gpu/drm/tegra/drm.c | 2 +-
drivers/gpu/drm/tiny/cirrus.c | 2 +-
drivers/gpu/drm/vboxvideo/vbox_drv.c | 2 +-
drivers/gpu/drm/vc4/vc4_drv.c | 2 +-
drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +-
include/drm/drm_aperture.h | 14 +++++++++-----
23 files changed, 43 insertions(+), 34 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 6f30c525caac..accf9c1b967a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -1278,7 +1278,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
#endif
/* Get rid of things like offb */
- ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "amdgpudrmfb");
+ ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &amdgpu_kms_driver);
if (ret)
return ret;
diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
index dab0a1f0983b..31925ae3ab72 100644
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -95,7 +95,7 @@ static int armada_drm_bind(struct device *dev)
}
/* Remove early framebuffers */
- ret = drm_aperture_remove_framebuffers(false, "armada-drm-fb");
+ ret = drm_aperture_remove_framebuffers(false, &armada_drm_driver);
if (ret) {
dev_err(dev, "[" DRM_NAME ":%s] can't kick out simple-fb: %d\n",
__func__, ret);
diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
index 5aa452b4efe6..86d5cd7b6318 100644
--- a/drivers/gpu/drm/ast/ast_drv.c
+++ b/drivers/gpu/drm/ast/ast_drv.c
@@ -100,7 +100,7 @@ static int ast_remove_conflicting_framebuffers(struct pci_dev *pdev)
primary = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;
#endif
- return drm_aperture_remove_conflicting_framebuffers(base, size, primary, "astdrmfb");
+ return drm_aperture_remove_conflicting_framebuffers(base, size, primary, &ast_driver);
}
static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c
index c828cadbabff..0d232b44ecd7 100644
--- a/drivers/gpu/drm/bochs/bochs_drv.c
+++ b/drivers/gpu/drm/bochs/bochs_drv.c
@@ -110,7 +110,7 @@ static int bochs_pci_probe(struct pci_dev *pdev,
return -ENOMEM;
}
- ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "bochsdrmfb");
+ ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &bochs_driver);
if (ret)
return ret;
diff --git a/drivers/gpu/drm/drm_aperture.c b/drivers/gpu/drm/drm_aperture.c
index 9335d9d6cf9a..9ac39cf11694 100644
--- a/drivers/gpu/drm/drm_aperture.c
+++ b/drivers/gpu/drm/drm_aperture.c
@@ -33,6 +33,10 @@
*
* .. code-block:: c
*
+ * static const struct drm_driver example_driver = {
+ * ...
+ * };
+ *
* static int remove_conflicting_framebuffers(struct pci_dev *pdev)
* {
* bool primary = false;
@@ -46,7 +50,7 @@
* #endif
*
* return drm_aperture_remove_conflicting_framebuffers(base, size, primary,
- * "example driver");
+ * &example_driver);
* }
*
* static int probe(struct pci_dev *pdev)
@@ -274,7 +278,7 @@ static void drm_aperture_detach_drivers(resource_size_t base, resource_size_t si
* @base: the aperture's base address in physical memory
* @size: aperture size in bytes
* @primary: also kick vga16fb if present
- * @name: requesting driver name
+ * @req_driver: requesting DRM driver
*
* This function removes graphics device drivers which use memory range described by
* @base and @size.
@@ -283,7 +287,7 @@ static void drm_aperture_detach_drivers(resource_size_t base, resource_size_t si
* 0 on success, or a negative errno code otherwise
*/
int drm_aperture_remove_conflicting_framebuffers(resource_size_t base, resource_size_t size,
- bool primary, const char *name)
+ bool primary, const struct drm_driver *req_driver)
{
#if IS_REACHABLE(CONFIG_FB)
struct apertures_struct *a;
@@ -296,7 +300,7 @@ int drm_aperture_remove_conflicting_framebuffers(resource_size_t base, resource_
a->ranges[0].base = base;
a->ranges[0].size = size;
- ret = remove_conflicting_framebuffers(a, name, primary);
+ ret = remove_conflicting_framebuffers(a, req_driver->name, primary);
kfree(a);
if (ret)
@@ -312,7 +316,7 @@ EXPORT_SYMBOL(drm_aperture_remove_conflicting_framebuffers);
/**
* drm_aperture_remove_conflicting_pci_framebuffers - remove existing framebuffers for PCI devices
* @pdev: PCI device
- * @name: requesting driver name
+ * @req_driver: requesting DRM driver
*
* This function removes graphics device drivers using memory range configured
* for any of @pdev's memory bars. The function assumes that PCI device with
@@ -321,7 +325,8 @@ EXPORT_SYMBOL(drm_aperture_remove_conflicting_framebuffers);
* Returns:
* 0 on success, or a negative errno code otherwise
*/
-int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev, const char *name)
+int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev,
+ const struct drm_driver *req_driver)
{
resource_size_t base, size;
int bar, ret = 0;
@@ -339,7 +344,7 @@ int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev, const
* otherwise the vga fbdev driver falls over.
*/
#if IS_REACHABLE(CONFIG_FB)
- ret = remove_conflicting_pci_framebuffers(pdev, name);
+ ret = remove_conflicting_pci_framebuffers(pdev, req_driver->name);
#endif
if (ret == 0)
ret = vga_remove_vgacon(pdev);
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
index f4bc5386574a..6f0297b854f2 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
@@ -314,7 +314,7 @@ static int hibmc_pci_probe(struct pci_dev *pdev,
struct drm_device *dev;
int ret;
- ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "hibmcdrmfb");
+ ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &hibmc_driver);
if (ret)
return ret;
diff --git a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c
index eb06c92c4bfd..cd818a629183 100644
--- a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c
+++ b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c
@@ -82,7 +82,7 @@ static int hyperv_setup_gen1(struct hyperv_drm_device *hv)
return -ENODEV;
}
- ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "hypervdrmfb");
+ ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &hyperv_driver);
if (ret) {
drm_err(dev, "Not able to remove boot fb\n");
return ret;
@@ -127,7 +127,7 @@ static int hyperv_setup_gen2(struct hyperv_drm_device *hv,
drm_aperture_remove_conflicting_framebuffers(screen_info.lfb_base,
screen_info.lfb_size,
false,
- "hypervdrmfb");
+ &hyperv_driver);
hv->fb_size = (unsigned long)hv->mmio_megabytes * 1024 * 1024;
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 850b499c71c8..62327c15f457 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -562,7 +562,7 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
if (ret)
goto err_perf;
- ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "inteldrmfb");
+ ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, dev_priv->drm.driver);
if (ret)
goto err_ggtt;
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index a7388bf7c838..3d0ccc7eef1b 100644
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -285,7 +285,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
* Remove early framebuffers (ie. simplefb). The framebuffer can be
* located anywhere in RAM
*/
- ret = drm_aperture_remove_framebuffers(false, "meson-drm-fb");
+ ret = drm_aperture_remove_framebuffers(false, &meson_driver);
if (ret)
goto free_drm;
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
index a701d9563257..36d1bfb3213f 100644
--- a/drivers/gpu/drm/mgag200/mgag200_drv.c
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
@@ -342,7 +342,7 @@ mgag200_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
struct drm_device *dev;
int ret;
- ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "mgag200drmfb");
+ ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &mgag200_driver);
if (ret)
return ret;
diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
index 227404077e39..67fae60f2fa5 100644
--- a/drivers/gpu/drm/msm/msm_fbdev.c
+++ b/drivers/gpu/drm/msm/msm_fbdev.c
@@ -169,7 +169,7 @@ struct drm_fb_helper *msm_fbdev_init(struct drm_device *dev)
}
/* the fw fb could be anywhere in memory */
- ret = drm_aperture_remove_framebuffers(false, "msm");
+ ret = drm_aperture_remove_framebuffers(false, dev->driver);
if (ret)
goto fini;
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index a616cf4573b8..df8a2d92f473 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -738,7 +738,7 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
nvkm_device_del(&device);
/* Remove conflicting drivers (vesafb, efifb etc). */
- ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "nouveaufb");
+ ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver_pci);
if (ret)
return ret;
diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c
index 854e6c5a563f..31f4c86ceb99 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.c
+++ b/drivers/gpu/drm/qxl/qxl_drv.c
@@ -95,7 +95,7 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (ret)
return ret;
- ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "qxl");
+ ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &qxl_driver);
if (ret)
goto disable_pci;
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 8cd135fa6dcd..82ee8244c9b3 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -330,7 +330,7 @@ static int radeon_pci_probe(struct pci_dev *pdev,
return -EPROBE_DEFER;
/* Get rid of things like offb */
- ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "radeondrmfb");
+ ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &kms_driver);
if (ret)
return ret;
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index b730b8d5d949..17a189bb6bbc 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@ -116,7 +116,7 @@ static int rockchip_drm_bind(struct device *dev)
int ret;
/* Remove existing drivers that may own the framebuffer memory. */
- ret = drm_aperture_remove_framebuffers(false, "rockchip-drm-fb");
+ ret = drm_aperture_remove_framebuffers(false, &rockchip_drm_driver);
if (ret) {
DRM_DEV_ERROR(dev,
"Failed to remove existing framebuffers - %d.\n",
diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
index af335f58bdfc..6bc1c8d6d43b 100644
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -100,7 +100,7 @@ static int sun4i_drv_bind(struct device *dev)
drm->irq_enabled = true;
/* Remove early framebuffers (ie. simplefb) */
- ret = drm_aperture_remove_framebuffers(false, "sun4i-drm-fb");
+ ret = drm_aperture_remove_framebuffers(false, &sun4i_drv_driver);
if (ret)
goto cleanup_mode_config;
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index f96c237b2242..2c8fc14bba1f 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -1204,7 +1204,7 @@ static int host1x_drm_probe(struct host1x_device *dev)
drm_mode_config_reset(drm);
- err = drm_aperture_remove_framebuffers(false, "tegradrmfb");
+ err = drm_aperture_remove_framebuffers(false, &tegra_drm_driver);
if (err < 0)
goto hub;
diff --git a/drivers/gpu/drm/tiny/cirrus.c b/drivers/gpu/drm/tiny/cirrus.c
index 42611dacde88..a8b476a59c0d 100644
--- a/drivers/gpu/drm/tiny/cirrus.c
+++ b/drivers/gpu/drm/tiny/cirrus.c
@@ -550,7 +550,7 @@ static int cirrus_pci_probe(struct pci_dev *pdev,
struct cirrus_device *cirrus;
int ret;
- ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "cirrusdrmfb");
+ ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &cirrus_driver);
if (ret)
return ret;
diff --git a/drivers/gpu/drm/vboxvideo/vbox_drv.c b/drivers/gpu/drm/vboxvideo/vbox_drv.c
index 6d4b32da9866..879a2445cc44 100644
--- a/drivers/gpu/drm/vboxvideo/vbox_drv.c
+++ b/drivers/gpu/drm/vboxvideo/vbox_drv.c
@@ -43,7 +43,7 @@ static int vbox_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (!vbox_check_supported(VBE_DISPI_ID_HGSMI))
return -ENODEV;
- ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "vboxvideodrmfb");
+ ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);
if (ret)
return ret;
diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
index 8a60fb8ad370..73335feb712f 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -265,7 +265,7 @@ static int vc4_drm_bind(struct device *dev)
if (ret)
goto unbind_all;
- ret = drm_aperture_remove_framebuffers(false, "vc4drmfb");
+ ret = drm_aperture_remove_framebuffers(false, &vc4_drm_driver);
if (ret)
goto unbind_all;
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c
index ca77edbc5ea0..ed85a7863256 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.c
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.c
@@ -57,7 +57,7 @@ static int virtio_gpu_pci_quirk(struct drm_device *dev, struct virtio_device *vd
vga ? "virtio-vga" : "virtio-gpu-pci",
pname);
if (vga) {
- ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "virtiodrmfb");
+ ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);
if (ret)
return ret;
}
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 086dc75e7b42..40864ce19ae1 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -1574,7 +1574,7 @@ static int vmw_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
struct vmw_private *vmw;
int ret;
- ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "svgadrmfb");
+ ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);
if (ret)
return ret;
diff --git a/include/drm/drm_aperture.h b/include/drm/drm_aperture.h
index 6c148078780c..7096703c3949 100644
--- a/include/drm/drm_aperture.h
+++ b/include/drm/drm_aperture.h
@@ -6,20 +6,22 @@
#include <linux/types.h>
struct drm_device;
+struct drm_driver;
struct pci_dev;
int devm_aperture_acquire_from_firmware(struct drm_device *dev, resource_size_t base,
resource_size_t size);
int drm_aperture_remove_conflicting_framebuffers(resource_size_t base, resource_size_t size,
- bool primary, const char *name);
+ bool primary, const struct drm_driver *req_driver);
-int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev, const char *name);
+int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev,
+ const struct drm_driver *req_driver);
/**
* drm_aperture_remove_framebuffers - remove all existing framebuffers
* @primary: also kick vga16fb if present
- * @name: requesting driver name
+ * @req_driver: requesting DRM driver
*
* This function removes all graphics device drivers. Use this function on systems
* that can have their framebuffer located anywhere in memory.
@@ -27,9 +29,11 @@ int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev, const
* Returns:
* 0 on success, or a negative errno code otherwise
*/
-static inline int drm_aperture_remove_framebuffers(bool primary, const char *name)
+static inline int
+drm_aperture_remove_framebuffers(bool primary, const struct drm_driver *req_driver)
{
- return drm_aperture_remove_conflicting_framebuffers(0, (resource_size_t)-1, primary, name);
+ return drm_aperture_remove_conflicting_framebuffers(0, (resource_size_t)-1, primary,
+ req_driver);
}
#endif
--
2.32.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/aperture: Pass DRM driver structure instead of driver name
2021-06-29 13:58 [Intel-gfx] [PATCH] drm/aperture: Pass DRM driver structure instead of driver name Thomas Zimmermann
@ 2021-06-29 14:58 ` Patchwork
2021-06-29 15:28 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2021-06-29 14:58 UTC (permalink / raw)
To: Thomas Zimmermann; +Cc: intel-gfx
== Series Details ==
Series: drm/aperture: Pass DRM driver structure instead of driver name
URL : https://patchwork.freedesktop.org/series/92015/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
bdaa421adb16 drm/aperture: Pass DRM driver structure instead of driver name
-:310: WARNING:OBSOLETE: drivers/gpu/drm/tiny/cirrus.c is marked as 'obsolete' in the MAINTAINERS hierarchy. No unnecessary modifications please.
-:313: WARNING:OBSOLETE: drivers/gpu/drm/tiny/cirrus.c is marked as 'obsolete' in the MAINTAINERS hierarchy. No unnecessary modifications please.
total: 0 errors, 2 warnings, 0 checks, 281 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/aperture: Pass DRM driver structure instead of driver name
2021-06-29 13:58 [Intel-gfx] [PATCH] drm/aperture: Pass DRM driver structure instead of driver name Thomas Zimmermann
2021-06-29 14:58 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
@ 2021-06-29 15:28 ` Patchwork
2021-06-29 15:32 ` [Intel-gfx] [PATCH] " Das, Nirmoy
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2021-06-29 15:28 UTC (permalink / raw)
To: Thomas Zimmermann; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 4805 bytes --]
== Series Details ==
Series: drm/aperture: Pass DRM driver structure instead of driver name
URL : https://patchwork.freedesktop.org/series/92015/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_10287 -> Patchwork_20486
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/index.html
Known issues
------------
Here are the changes found in Patchwork_20486 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@cs-gfx:
- fi-kbl-soraka: NOTRUN -> [SKIP][1] ([fdo#109271]) +11 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/fi-kbl-soraka/igt@amdgpu/amd_basic@cs-gfx.html
* igt@amdgpu/amd_basic@semaphore:
- fi-icl-y: NOTRUN -> [SKIP][2] ([fdo#109315]) +17 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/fi-icl-y/igt@amdgpu/amd_basic@semaphore.html
* igt@gem_huc_copy@huc-copy:
- fi-icl-y: NOTRUN -> [SKIP][3] ([i915#2190])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/fi-icl-y/igt@gem_huc_copy@huc-copy.html
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7500u: [PASS][4] -> [FAIL][5] ([i915#3449])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/fi-kbl-7500u/igt@kms_chamelium@common-hpd-after-suspend.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/fi-kbl-7500u/igt@kms_chamelium@common-hpd-after-suspend.html
* igt@kms_chamelium@dp-crc-fast:
- fi-icl-y: NOTRUN -> [SKIP][6] ([fdo#109284] / [fdo#111827]) +8 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/fi-icl-y/igt@kms_chamelium@dp-crc-fast.html
* igt@kms_force_connector_basic@force-load-detect:
- fi-icl-y: NOTRUN -> [SKIP][7] ([fdo#109285])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/fi-icl-y/igt@kms_force_connector_basic@force-load-detect.html
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-icl-y: NOTRUN -> [SKIP][8] ([fdo#109278])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/fi-icl-y/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html
* igt@kms_psr@primary_mmap_gtt:
- fi-icl-y: NOTRUN -> [SKIP][9] ([fdo#110189]) +3 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/fi-icl-y/igt@kms_psr@primary_mmap_gtt.html
* igt@prime_vgem@basic-userptr:
- fi-icl-y: NOTRUN -> [SKIP][10] ([i915#3301])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/fi-icl-y/igt@prime_vgem@basic-userptr.html
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s3:
- {fi-tgl-1115g4}: [FAIL][11] ([i915#1888]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/fi-tgl-1115g4/igt@gem_exec_suspend@basic-s3.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/fi-tgl-1115g4/igt@gem_exec_suspend@basic-s3.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3449]: https://gitlab.freedesktop.org/drm/intel/issues/3449
Participating hosts (41 -> 37)
------------------------------
Additional (1): fi-icl-y
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_10287 -> Patchwork_20486
CI-20190529: 20190529
CI_DRM_10287: b6886aad3645be843b71bc508110ab7f974fd41d @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6121: a63ceb48e6c3e733d04156b32fba3b4f4d5ad794 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_20486: bdaa421adb1693aae2d9a3e9f8e0aa2d740b65c6 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
bdaa421adb16 drm/aperture: Pass DRM driver structure instead of driver name
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/index.html
[-- Attachment #1.2: Type: text/html, Size: 5656 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/aperture: Pass DRM driver structure instead of driver name
2021-06-29 13:58 [Intel-gfx] [PATCH] drm/aperture: Pass DRM driver structure instead of driver name Thomas Zimmermann
2021-06-29 14:58 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2021-06-29 15:28 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
@ 2021-06-29 15:32 ` Das, Nirmoy
2021-06-29 15:59 ` Chen-Yu Tsai
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Das, Nirmoy @ 2021-06-29 15:32 UTC (permalink / raw)
To: Thomas Zimmermann, daniel, airlied
Cc: linux-hyperv, nouveau, intel-gfx, dri-devel, virtualization,
linux-rockchip, amd-gfx, linux-arm-msm, linux-tegra, spice-devel,
linux-amlogic, freedreno, linux-sunxi, linux-arm-kernel
LGTM
Acked-by: Nirmoy Das <nirmoy.das@amd.com>
On 6/29/2021 3:58 PM, Thomas Zimmermann wrote:
> Print the name of the DRM driver when taking over fbdev devices. Makes
> the output to dmesg more consistent. Note that the driver name is only
> used for printing a string to the kernel log. No UAPI is affected by this
> change.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +-
> drivers/gpu/drm/armada/armada_drv.c | 2 +-
> drivers/gpu/drm/ast/ast_drv.c | 2 +-
> drivers/gpu/drm/bochs/bochs_drv.c | 2 +-
> drivers/gpu/drm/drm_aperture.c | 19 ++++++++++++-------
> .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 2 +-
> drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 4 ++--
> drivers/gpu/drm/i915/i915_drv.c | 2 +-
> drivers/gpu/drm/meson/meson_drv.c | 2 +-
> drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +-
> drivers/gpu/drm/msm/msm_fbdev.c | 2 +-
> drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +-
> drivers/gpu/drm/qxl/qxl_drv.c | 2 +-
> drivers/gpu/drm/radeon/radeon_drv.c | 2 +-
> drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +-
> drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +-
> drivers/gpu/drm/tegra/drm.c | 2 +-
> drivers/gpu/drm/tiny/cirrus.c | 2 +-
> drivers/gpu/drm/vboxvideo/vbox_drv.c | 2 +-
> drivers/gpu/drm/vc4/vc4_drv.c | 2 +-
> drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +-
> include/drm/drm_aperture.h | 14 +++++++++-----
> 23 files changed, 43 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> index 6f30c525caac..accf9c1b967a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> @@ -1278,7 +1278,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
> #endif
>
> /* Get rid of things like offb */
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "amdgpudrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &amdgpu_kms_driver);
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
> index dab0a1f0983b..31925ae3ab72 100644
> --- a/drivers/gpu/drm/armada/armada_drv.c
> +++ b/drivers/gpu/drm/armada/armada_drv.c
> @@ -95,7 +95,7 @@ static int armada_drm_bind(struct device *dev)
> }
>
> /* Remove early framebuffers */
> - ret = drm_aperture_remove_framebuffers(false, "armada-drm-fb");
> + ret = drm_aperture_remove_framebuffers(false, &armada_drm_driver);
> if (ret) {
> dev_err(dev, "[" DRM_NAME ":%s] can't kick out simple-fb: %d\n",
> __func__, ret);
> diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
> index 5aa452b4efe6..86d5cd7b6318 100644
> --- a/drivers/gpu/drm/ast/ast_drv.c
> +++ b/drivers/gpu/drm/ast/ast_drv.c
> @@ -100,7 +100,7 @@ static int ast_remove_conflicting_framebuffers(struct pci_dev *pdev)
> primary = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;
> #endif
>
> - return drm_aperture_remove_conflicting_framebuffers(base, size, primary, "astdrmfb");
> + return drm_aperture_remove_conflicting_framebuffers(base, size, primary, &ast_driver);
> }
>
> static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c
> index c828cadbabff..0d232b44ecd7 100644
> --- a/drivers/gpu/drm/bochs/bochs_drv.c
> +++ b/drivers/gpu/drm/bochs/bochs_drv.c
> @@ -110,7 +110,7 @@ static int bochs_pci_probe(struct pci_dev *pdev,
> return -ENOMEM;
> }
>
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "bochsdrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &bochs_driver);
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/drm_aperture.c b/drivers/gpu/drm/drm_aperture.c
> index 9335d9d6cf9a..9ac39cf11694 100644
> --- a/drivers/gpu/drm/drm_aperture.c
> +++ b/drivers/gpu/drm/drm_aperture.c
> @@ -33,6 +33,10 @@
> *
> * .. code-block:: c
> *
> + * static const struct drm_driver example_driver = {
> + * ...
> + * };
> + *
> * static int remove_conflicting_framebuffers(struct pci_dev *pdev)
> * {
> * bool primary = false;
> @@ -46,7 +50,7 @@
> * #endif
> *
> * return drm_aperture_remove_conflicting_framebuffers(base, size, primary,
> - * "example driver");
> + * &example_driver);
> * }
> *
> * static int probe(struct pci_dev *pdev)
> @@ -274,7 +278,7 @@ static void drm_aperture_detach_drivers(resource_size_t base, resource_size_t si
> * @base: the aperture's base address in physical memory
> * @size: aperture size in bytes
> * @primary: also kick vga16fb if present
> - * @name: requesting driver name
> + * @req_driver: requesting DRM driver
> *
> * This function removes graphics device drivers which use memory range described by
> * @base and @size.
> @@ -283,7 +287,7 @@ static void drm_aperture_detach_drivers(resource_size_t base, resource_size_t si
> * 0 on success, or a negative errno code otherwise
> */
> int drm_aperture_remove_conflicting_framebuffers(resource_size_t base, resource_size_t size,
> - bool primary, const char *name)
> + bool primary, const struct drm_driver *req_driver)
> {
> #if IS_REACHABLE(CONFIG_FB)
> struct apertures_struct *a;
> @@ -296,7 +300,7 @@ int drm_aperture_remove_conflicting_framebuffers(resource_size_t base, resource_
> a->ranges[0].base = base;
> a->ranges[0].size = size;
>
> - ret = remove_conflicting_framebuffers(a, name, primary);
> + ret = remove_conflicting_framebuffers(a, req_driver->name, primary);
> kfree(a);
>
> if (ret)
> @@ -312,7 +316,7 @@ EXPORT_SYMBOL(drm_aperture_remove_conflicting_framebuffers);
> /**
> * drm_aperture_remove_conflicting_pci_framebuffers - remove existing framebuffers for PCI devices
> * @pdev: PCI device
> - * @name: requesting driver name
> + * @req_driver: requesting DRM driver
> *
> * This function removes graphics device drivers using memory range configured
> * for any of @pdev's memory bars. The function assumes that PCI device with
> @@ -321,7 +325,8 @@ EXPORT_SYMBOL(drm_aperture_remove_conflicting_framebuffers);
> * Returns:
> * 0 on success, or a negative errno code otherwise
> */
> -int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev, const char *name)
> +int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev,
> + const struct drm_driver *req_driver)
> {
> resource_size_t base, size;
> int bar, ret = 0;
> @@ -339,7 +344,7 @@ int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev, const
> * otherwise the vga fbdev driver falls over.
> */
> #if IS_REACHABLE(CONFIG_FB)
> - ret = remove_conflicting_pci_framebuffers(pdev, name);
> + ret = remove_conflicting_pci_framebuffers(pdev, req_driver->name);
> #endif
> if (ret == 0)
> ret = vga_remove_vgacon(pdev);
> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> index f4bc5386574a..6f0297b854f2 100644
> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> @@ -314,7 +314,7 @@ static int hibmc_pci_probe(struct pci_dev *pdev,
> struct drm_device *dev;
> int ret;
>
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "hibmcdrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &hibmc_driver);
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c
> index eb06c92c4bfd..cd818a629183 100644
> --- a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c
> +++ b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c
> @@ -82,7 +82,7 @@ static int hyperv_setup_gen1(struct hyperv_drm_device *hv)
> return -ENODEV;
> }
>
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "hypervdrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &hyperv_driver);
> if (ret) {
> drm_err(dev, "Not able to remove boot fb\n");
> return ret;
> @@ -127,7 +127,7 @@ static int hyperv_setup_gen2(struct hyperv_drm_device *hv,
> drm_aperture_remove_conflicting_framebuffers(screen_info.lfb_base,
> screen_info.lfb_size,
> false,
> - "hypervdrmfb");
> + &hyperv_driver);
>
> hv->fb_size = (unsigned long)hv->mmio_megabytes * 1024 * 1024;
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 850b499c71c8..62327c15f457 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -562,7 +562,7 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
> if (ret)
> goto err_perf;
>
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "inteldrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, dev_priv->drm.driver);
> if (ret)
> goto err_ggtt;
>
> diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
> index a7388bf7c838..3d0ccc7eef1b 100644
> --- a/drivers/gpu/drm/meson/meson_drv.c
> +++ b/drivers/gpu/drm/meson/meson_drv.c
> @@ -285,7 +285,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
> * Remove early framebuffers (ie. simplefb). The framebuffer can be
> * located anywhere in RAM
> */
> - ret = drm_aperture_remove_framebuffers(false, "meson-drm-fb");
> + ret = drm_aperture_remove_framebuffers(false, &meson_driver);
> if (ret)
> goto free_drm;
>
> diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
> index a701d9563257..36d1bfb3213f 100644
> --- a/drivers/gpu/drm/mgag200/mgag200_drv.c
> +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
> @@ -342,7 +342,7 @@ mgag200_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> struct drm_device *dev;
> int ret;
>
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "mgag200drmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &mgag200_driver);
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
> index 227404077e39..67fae60f2fa5 100644
> --- a/drivers/gpu/drm/msm/msm_fbdev.c
> +++ b/drivers/gpu/drm/msm/msm_fbdev.c
> @@ -169,7 +169,7 @@ struct drm_fb_helper *msm_fbdev_init(struct drm_device *dev)
> }
>
> /* the fw fb could be anywhere in memory */
> - ret = drm_aperture_remove_framebuffers(false, "msm");
> + ret = drm_aperture_remove_framebuffers(false, dev->driver);
> if (ret)
> goto fini;
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
> index a616cf4573b8..df8a2d92f473 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_drm.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
> @@ -738,7 +738,7 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
> nvkm_device_del(&device);
>
> /* Remove conflicting drivers (vesafb, efifb etc). */
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "nouveaufb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver_pci);
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c
> index 854e6c5a563f..31f4c86ceb99 100644
> --- a/drivers/gpu/drm/qxl/qxl_drv.c
> +++ b/drivers/gpu/drm/qxl/qxl_drv.c
> @@ -95,7 +95,7 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> if (ret)
> return ret;
>
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "qxl");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &qxl_driver);
> if (ret)
> goto disable_pci;
>
> diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
> index 8cd135fa6dcd..82ee8244c9b3 100644
> --- a/drivers/gpu/drm/radeon/radeon_drv.c
> +++ b/drivers/gpu/drm/radeon/radeon_drv.c
> @@ -330,7 +330,7 @@ static int radeon_pci_probe(struct pci_dev *pdev,
> return -EPROBE_DEFER;
>
> /* Get rid of things like offb */
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "radeondrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &kms_driver);
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> index b730b8d5d949..17a189bb6bbc 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> @@ -116,7 +116,7 @@ static int rockchip_drm_bind(struct device *dev)
> int ret;
>
> /* Remove existing drivers that may own the framebuffer memory. */
> - ret = drm_aperture_remove_framebuffers(false, "rockchip-drm-fb");
> + ret = drm_aperture_remove_framebuffers(false, &rockchip_drm_driver);
> if (ret) {
> DRM_DEV_ERROR(dev,
> "Failed to remove existing framebuffers - %d.\n",
> diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
> index af335f58bdfc..6bc1c8d6d43b 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_drv.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
> @@ -100,7 +100,7 @@ static int sun4i_drv_bind(struct device *dev)
> drm->irq_enabled = true;
>
> /* Remove early framebuffers (ie. simplefb) */
> - ret = drm_aperture_remove_framebuffers(false, "sun4i-drm-fb");
> + ret = drm_aperture_remove_framebuffers(false, &sun4i_drv_driver);
> if (ret)
> goto cleanup_mode_config;
>
> diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
> index f96c237b2242..2c8fc14bba1f 100644
> --- a/drivers/gpu/drm/tegra/drm.c
> +++ b/drivers/gpu/drm/tegra/drm.c
> @@ -1204,7 +1204,7 @@ static int host1x_drm_probe(struct host1x_device *dev)
>
> drm_mode_config_reset(drm);
>
> - err = drm_aperture_remove_framebuffers(false, "tegradrmfb");
> + err = drm_aperture_remove_framebuffers(false, &tegra_drm_driver);
> if (err < 0)
> goto hub;
>
> diff --git a/drivers/gpu/drm/tiny/cirrus.c b/drivers/gpu/drm/tiny/cirrus.c
> index 42611dacde88..a8b476a59c0d 100644
> --- a/drivers/gpu/drm/tiny/cirrus.c
> +++ b/drivers/gpu/drm/tiny/cirrus.c
> @@ -550,7 +550,7 @@ static int cirrus_pci_probe(struct pci_dev *pdev,
> struct cirrus_device *cirrus;
> int ret;
>
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "cirrusdrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &cirrus_driver);
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/vboxvideo/vbox_drv.c b/drivers/gpu/drm/vboxvideo/vbox_drv.c
> index 6d4b32da9866..879a2445cc44 100644
> --- a/drivers/gpu/drm/vboxvideo/vbox_drv.c
> +++ b/drivers/gpu/drm/vboxvideo/vbox_drv.c
> @@ -43,7 +43,7 @@ static int vbox_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> if (!vbox_check_supported(VBE_DISPI_ID_HGSMI))
> return -ENODEV;
>
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "vboxvideodrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
> index 8a60fb8ad370..73335feb712f 100644
> --- a/drivers/gpu/drm/vc4/vc4_drv.c
> +++ b/drivers/gpu/drm/vc4/vc4_drv.c
> @@ -265,7 +265,7 @@ static int vc4_drm_bind(struct device *dev)
> if (ret)
> goto unbind_all;
>
> - ret = drm_aperture_remove_framebuffers(false, "vc4drmfb");
> + ret = drm_aperture_remove_framebuffers(false, &vc4_drm_driver);
> if (ret)
> goto unbind_all;
>
> diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c
> index ca77edbc5ea0..ed85a7863256 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_drv.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c
> @@ -57,7 +57,7 @@ static int virtio_gpu_pci_quirk(struct drm_device *dev, struct virtio_device *vd
> vga ? "virtio-vga" : "virtio-gpu-pci",
> pname);
> if (vga) {
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "virtiodrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);
> if (ret)
> return ret;
> }
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> index 086dc75e7b42..40864ce19ae1 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> @@ -1574,7 +1574,7 @@ static int vmw_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> struct vmw_private *vmw;
> int ret;
>
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "svgadrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);
> if (ret)
> return ret;
>
> diff --git a/include/drm/drm_aperture.h b/include/drm/drm_aperture.h
> index 6c148078780c..7096703c3949 100644
> --- a/include/drm/drm_aperture.h
> +++ b/include/drm/drm_aperture.h
> @@ -6,20 +6,22 @@
> #include <linux/types.h>
>
> struct drm_device;
> +struct drm_driver;
> struct pci_dev;
>
> int devm_aperture_acquire_from_firmware(struct drm_device *dev, resource_size_t base,
> resource_size_t size);
>
> int drm_aperture_remove_conflicting_framebuffers(resource_size_t base, resource_size_t size,
> - bool primary, const char *name);
> + bool primary, const struct drm_driver *req_driver);
>
> -int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev, const char *name);
> +int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev,
> + const struct drm_driver *req_driver);
>
> /**
> * drm_aperture_remove_framebuffers - remove all existing framebuffers
> * @primary: also kick vga16fb if present
> - * @name: requesting driver name
> + * @req_driver: requesting DRM driver
> *
> * This function removes all graphics device drivers. Use this function on systems
> * that can have their framebuffer located anywhere in memory.
> @@ -27,9 +29,11 @@ int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev, const
> * Returns:
> * 0 on success, or a negative errno code otherwise
> */
> -static inline int drm_aperture_remove_framebuffers(bool primary, const char *name)
> +static inline int
> +drm_aperture_remove_framebuffers(bool primary, const struct drm_driver *req_driver)
> {
> - return drm_aperture_remove_conflicting_framebuffers(0, (resource_size_t)-1, primary, name);
> + return drm_aperture_remove_conflicting_framebuffers(0, (resource_size_t)-1, primary,
> + req_driver);
> }
>
> #endif
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/aperture: Pass DRM driver structure instead of driver name
2021-06-29 13:58 [Intel-gfx] [PATCH] drm/aperture: Pass DRM driver structure instead of driver name Thomas Zimmermann
` (2 preceding siblings ...)
2021-06-29 15:32 ` [Intel-gfx] [PATCH] " Das, Nirmoy
@ 2021-06-29 15:59 ` Chen-Yu Tsai
2021-06-29 17:03 ` Neil Armstrong
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Chen-Yu Tsai @ 2021-06-29 15:59 UTC (permalink / raw)
To: Thomas Zimmermann
Cc: linux-hyperv, Intel Graphics, nouveau, linux-arm-msm, dri-devel,
virtualization, open list:ARM/Rockchip SoC...,
amd-gfx, spice-devel, linux-tegra, airlied,
open list:ARM/Amlogic Meson...,
freedreno, linux-sunxi, linux-arm-kernel
On Tue, Jun 29, 2021 at 9:58 PM Thomas Zimmermann <tzimmermann@suse.de> wrote:
>
> Print the name of the DRM driver when taking over fbdev devices. Makes
> the output to dmesg more consistent. Note that the driver name is only
> used for printing a string to the kernel log. No UAPI is affected by this
> change.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
> drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +-
Acked-by: Chen-Yu Tsai <wens@csie.org>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/aperture: Pass DRM driver structure instead of driver name
2021-06-29 13:58 [Intel-gfx] [PATCH] drm/aperture: Pass DRM driver structure instead of driver name Thomas Zimmermann
` (3 preceding siblings ...)
2021-06-29 15:59 ` Chen-Yu Tsai
@ 2021-06-29 17:03 ` Neil Armstrong
2021-06-29 17:31 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for " Patchwork
2021-08-05 20:37 ` [Intel-gfx] [PATCH] " Dmitry Baryshkov
6 siblings, 0 replies; 8+ messages in thread
From: Neil Armstrong @ 2021-06-29 17:03 UTC (permalink / raw)
To: Thomas Zimmermann, daniel, airlied
Cc: linux-hyperv, nouveau, intel-gfx, dri-devel, virtualization,
linux-rockchip, amd-gfx, linux-arm-msm, linux-tegra, spice-devel,
linux-amlogic, freedreno, linux-sunxi, linux-arm-kernel
Hi,
On 29/06/2021 15:58, Thomas Zimmermann wrote:
> Print the name of the DRM driver when taking over fbdev devices. Makes
> the output to dmesg more consistent. Note that the driver name is only
> used for printing a string to the kernel log. No UAPI is affected by this
> change.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
...
> drivers/gpu/drm/meson/meson_drv.c | 2 +-
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
...
>
> diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
> index a7388bf7c838..3d0ccc7eef1b 100644
> --- a/drivers/gpu/drm/meson/meson_drv.c
> +++ b/drivers/gpu/drm/meson/meson_drv.c
> @@ -285,7 +285,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
> * Remove early framebuffers (ie. simplefb). The framebuffer can be
> * located anywhere in RAM
> */
> - ret = drm_aperture_remove_framebuffers(false, "meson-drm-fb");
> + ret = drm_aperture_remove_framebuffers(false, &meson_driver);
> if (ret)
> goto free_drm;
>
...
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/aperture: Pass DRM driver structure instead of driver name
2021-06-29 13:58 [Intel-gfx] [PATCH] drm/aperture: Pass DRM driver structure instead of driver name Thomas Zimmermann
` (4 preceding siblings ...)
2021-06-29 17:03 ` Neil Armstrong
@ 2021-06-29 17:31 ` Patchwork
2021-08-05 20:37 ` [Intel-gfx] [PATCH] " Dmitry Baryshkov
6 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2021-06-29 17:31 UTC (permalink / raw)
To: Thomas Zimmermann; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 30284 bytes --]
== Series Details ==
Series: drm/aperture: Pass DRM driver structure instead of driver name
URL : https://patchwork.freedesktop.org/series/92015/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_10287_full -> Patchwork_20486_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_20486_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_20486_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_20486_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_mmap_gtt@basic-small-bo-tiledy:
- shard-iclb: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-iclb8/igt@gem_mmap_gtt@basic-small-bo-tiledy.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-iclb3/igt@gem_mmap_gtt@basic-small-bo-tiledy.html
#### Warnings ####
* igt@runner@aborted:
- shard-iclb: ([FAIL][3], [FAIL][4], [FAIL][5]) ([i915#3002]) -> ([FAIL][6], [FAIL][7], [FAIL][8], [FAIL][9], [FAIL][10], [FAIL][11]) ([i915#1814] / [i915#3002])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-iclb3/igt@runner@aborted.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-iclb3/igt@runner@aborted.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-iclb8/igt@runner@aborted.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-iclb4/igt@runner@aborted.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-iclb6/igt@runner@aborted.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-iclb1/igt@runner@aborted.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-iclb6/igt@runner@aborted.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-iclb6/igt@runner@aborted.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-iclb1/igt@runner@aborted.html
Known issues
------------
Here are the changes found in Patchwork_20486_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_persistence@legacy-engines-mixed:
- shard-snb: NOTRUN -> [SKIP][12] ([fdo#109271] / [i915#1099]) +2 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-snb2/igt@gem_ctx_persistence@legacy-engines-mixed.html
* igt@gem_eio@unwedge-stress:
- shard-tglb: [PASS][13] -> [TIMEOUT][14] ([i915#2369] / [i915#3063])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-tglb6/igt@gem_eio@unwedge-stress.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-tglb5/igt@gem_eio@unwedge-stress.html
* igt@gem_exec_fair@basic-flow@rcs0:
- shard-tglb: [PASS][15] -> [FAIL][16] ([i915#2842])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-tglb6/igt@gem_exec_fair@basic-flow@rcs0.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-tglb5/igt@gem_exec_fair@basic-flow@rcs0.html
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [PASS][17] -> [FAIL][18] ([i915#2842]) +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-glk4/igt@gem_exec_fair@basic-pace-share@rcs0.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-glk6/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@gem_exec_suspend@basic-s3:
- shard-kbl: [PASS][19] -> [DMESG-WARN][20] ([i915#180]) +3 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-kbl3/igt@gem_exec_suspend@basic-s3.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-kbl1/igt@gem_exec_suspend@basic-s3.html
* igt@gem_mmap_gtt@cpuset-basic-small-copy-xy:
- shard-skl: [PASS][21] -> [FAIL][22] ([i915#307])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-skl9/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-skl2/igt@gem_mmap_gtt@cpuset-basic-small-copy-xy.html
* igt@gem_mmap_gtt@cpuset-big-copy-xy:
- shard-iclb: [PASS][23] -> [FAIL][24] ([i915#307])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-iclb1/igt@gem_mmap_gtt@cpuset-big-copy-xy.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-iclb3/igt@gem_mmap_gtt@cpuset-big-copy-xy.html
* igt@gem_pread@exhaustion:
- shard-apl: NOTRUN -> [WARN][25] ([i915#2658])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-apl6/igt@gem_pread@exhaustion.html
* igt@gem_userptr_blits@dmabuf-sync:
- shard-apl: NOTRUN -> [SKIP][26] ([fdo#109271] / [i915#3323])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-apl1/igt@gem_userptr_blits@dmabuf-sync.html
* igt@gem_userptr_blits@input-checking:
- shard-apl: NOTRUN -> [DMESG-WARN][27] ([i915#3002])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-apl6/igt@gem_userptr_blits@input-checking.html
* igt@gen9_exec_parse@allowed-all:
- shard-glk: [PASS][28] -> [DMESG-WARN][29] ([i915#1436] / [i915#716])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-glk2/igt@gen9_exec_parse@allowed-all.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-glk7/igt@gen9_exec_parse@allowed-all.html
* igt@gen9_exec_parse@bb-large:
- shard-apl: NOTRUN -> [FAIL][30] ([i915#3296])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-apl1/igt@gen9_exec_parse@bb-large.html
* igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-dp:
- shard-apl: NOTRUN -> [SKIP][31] ([fdo#109271] / [i915#1937])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-apl1/igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-dp.html
* igt@i915_suspend@sysfs-reader:
- shard-apl: [PASS][32] -> [DMESG-WARN][33] ([i915#180])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-apl6/igt@i915_suspend@sysfs-reader.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-apl2/igt@i915_suspend@sysfs-reader.html
* igt@kms_big_fb@x-tiled-32bpp-rotate-0:
- shard-glk: [PASS][34] -> [DMESG-WARN][35] ([i915#118] / [i915#95]) +1 similar issue
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-glk7/igt@kms_big_fb@x-tiled-32bpp-rotate-0.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-glk5/igt@kms_big_fb@x-tiled-32bpp-rotate-0.html
* igt@kms_big_fb@x-tiled-32bpp-rotate-180:
- shard-iclb: [PASS][36] -> [DMESG-WARN][37] ([i915#3621]) +1 similar issue
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-iclb3/igt@kms_big_fb@x-tiled-32bpp-rotate-180.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-iclb1/igt@kms_big_fb@x-tiled-32bpp-rotate-180.html
* igt@kms_chamelium@hdmi-aspect-ratio:
- shard-kbl: NOTRUN -> [SKIP][38] ([fdo#109271] / [fdo#111827])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-kbl4/igt@kms_chamelium@hdmi-aspect-ratio.html
* igt@kms_chamelium@hdmi-edid-change-during-suspend:
- shard-apl: NOTRUN -> [SKIP][39] ([fdo#109271] / [fdo#111827]) +19 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-apl8/igt@kms_chamelium@hdmi-edid-change-during-suspend.html
* igt@kms_chamelium@vga-hpd-for-each-pipe:
- shard-skl: NOTRUN -> [SKIP][40] ([fdo#109271] / [fdo#111827]) +1 similar issue
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-skl1/igt@kms_chamelium@vga-hpd-for-each-pipe.html
* igt@kms_color_chamelium@pipe-a-ctm-0-25:
- shard-snb: NOTRUN -> [SKIP][41] ([fdo#109271] / [fdo#111827]) +19 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-snb2/igt@kms_color_chamelium@pipe-a-ctm-0-25.html
* igt@kms_color_chamelium@pipe-a-ctm-limited-range:
- shard-glk: NOTRUN -> [SKIP][42] ([fdo#109271] / [fdo#111827]) +3 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-glk5/igt@kms_color_chamelium@pipe-a-ctm-limited-range.html
* igt@kms_cursor_edge_walk@pipe-d-128x128-right-edge:
- shard-snb: NOTRUN -> [SKIP][43] ([fdo#109271]) +334 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-snb5/igt@kms_cursor_edge_walk@pipe-d-128x128-right-edge.html
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs:
- shard-apl: NOTRUN -> [SKIP][44] ([fdo#109271] / [i915#2672])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-apl6/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-draw-mmap-gtt:
- shard-kbl: NOTRUN -> [SKIP][45] ([fdo#109271])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-kbl4/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-draw-mmap-gtt.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-fullscreen:
- shard-skl: NOTRUN -> [SKIP][46] ([fdo#109271]) +6 similar issues
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-skl1/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-fullscreen.html
* igt@kms_frontbuffer_tracking@psr-2p-scndscrn-spr-indfb-draw-render:
- shard-glk: NOTRUN -> [SKIP][47] ([fdo#109271]) +30 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-glk5/igt@kms_frontbuffer_tracking@psr-2p-scndscrn-spr-indfb-draw-render.html
* igt@kms_hdr@bpc-switch-suspend:
- shard-skl: [PASS][48] -> [FAIL][49] ([i915#1188])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-skl3/igt@kms_hdr@bpc-switch-suspend.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-skl9/igt@kms_hdr@bpc-switch-suspend.html
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-d-frame-sequence:
- shard-apl: NOTRUN -> [SKIP][50] ([fdo#109271] / [i915#533]) +1 similar issue
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-apl6/igt@kms_pipe_crc_basic@nonblocking-crc-pipe-d-frame-sequence.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-d:
- shard-glk: NOTRUN -> [SKIP][51] ([fdo#109271] / [i915#533])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-glk5/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-d.html
* igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb:
- shard-apl: NOTRUN -> [FAIL][52] ([fdo#108145] / [i915#265]) +2 similar issues
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-apl1/igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb.html
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min:
- shard-skl: [PASS][53] -> [FAIL][54] ([fdo#108145] / [i915#265])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-skl7/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-skl6/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min.html
* igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb:
- shard-kbl: NOTRUN -> [FAIL][55] ([i915#265])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-kbl4/igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb.html
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-3:
- shard-apl: NOTRUN -> [SKIP][56] ([fdo#109271] / [i915#658]) +3 similar issues
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-apl6/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-3.html
* igt@kms_psr2_su@frontbuffer:
- shard-glk: NOTRUN -> [SKIP][57] ([fdo#109271] / [i915#658]) +1 similar issue
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-glk5/igt@kms_psr2_su@frontbuffer.html
- shard-iclb: [PASS][58] -> [SKIP][59] ([fdo#109642] / [fdo#111068] / [i915#658])
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-iclb2/igt@kms_psr2_su@frontbuffer.html
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-iclb6/igt@kms_psr2_su@frontbuffer.html
* igt@kms_psr@psr2_sprite_blt:
- shard-iclb: [PASS][60] -> [SKIP][61] ([fdo#109441]) +1 similar issue
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-iclb2/igt@kms_psr@psr2_sprite_blt.html
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-iclb3/igt@kms_psr@psr2_sprite_blt.html
* igt@perf@short-reads:
- shard-skl: [PASS][62] -> [FAIL][63] ([i915#51])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-skl5/igt@perf@short-reads.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-skl7/igt@perf@short-reads.html
* igt@prime_nv_api@i915_nv_reimport_twice_check_flink_name:
- shard-apl: NOTRUN -> [SKIP][64] ([fdo#109271]) +166 similar issues
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-apl3/igt@prime_nv_api@i915_nv_reimport_twice_check_flink_name.html
* igt@prime_vgem@sync@rcs0:
- shard-tglb: [PASS][65] -> [INCOMPLETE][66] ([i915#409])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-tglb7/igt@prime_vgem@sync@rcs0.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-tglb7/igt@prime_vgem@sync@rcs0.html
* igt@sysfs_clients@pidname:
- shard-apl: NOTRUN -> [SKIP][67] ([fdo#109271] / [i915#2994]) +1 similar issue
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-apl1/igt@sysfs_clients@pidname.html
* igt@sysfs_clients@split-25:
- shard-glk: NOTRUN -> [SKIP][68] ([fdo#109271] / [i915#2994])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-glk5/igt@sysfs_clients@split-25.html
#### Possible fixes ####
* igt@gem_ctx_persistence@many-contexts:
- shard-tglb: [FAIL][69] ([i915#2410]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-tglb7/igt@gem_ctx_persistence@many-contexts.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-tglb7/igt@gem_ctx_persistence@many-contexts.html
* igt@gem_exec_fair@basic-none@vecs0:
- shard-kbl: [FAIL][71] ([i915#2842]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-kbl4/igt@gem_exec_fair@basic-none@vecs0.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-kbl3/igt@gem_exec_fair@basic-none@vecs0.html
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-tglb: [FAIL][73] ([i915#2842]) -> [PASS][74] +2 similar issues
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-tglb3/igt@gem_exec_fair@basic-pace-share@rcs0.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-tglb3/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@gem_exec_whisper@basic-queues-forked-all:
- shard-glk: [DMESG-WARN][75] ([i915#118] / [i915#95]) -> [PASS][76] +2 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-glk6/igt@gem_exec_whisper@basic-queues-forked-all.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-glk3/igt@gem_exec_whisper@basic-queues-forked-all.html
* igt@gem_mmap_gtt@big-copy:
- shard-glk: [FAIL][77] ([i915#307]) -> [PASS][78] +1 similar issue
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-glk6/igt@gem_mmap_gtt@big-copy.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-glk2/igt@gem_mmap_gtt@big-copy.html
* igt@kms_async_flips@alternate-sync-async-flip:
- shard-skl: [FAIL][79] ([i915#2521]) -> [PASS][80]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-skl3/igt@kms_async_flips@alternate-sync-async-flip.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-skl5/igt@kms_async_flips@alternate-sync-async-flip.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-skl: [FAIL][81] ([i915#2346]) -> [PASS][82]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-skl8/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-skl4/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
* igt@kms_flip@flip-vs-expired-vblank@c-edp1:
- shard-skl: [FAIL][83] ([i915#79]) -> [PASS][84]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-skl10/igt@kms_flip@flip-vs-expired-vblank@c-edp1.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-skl4/igt@kms_flip@flip-vs-expired-vblank@c-edp1.html
* igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
- shard-kbl: [DMESG-WARN][85] ([i915#180]) -> [PASS][86] +4 similar issues
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-kbl2/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-kbl6/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [FAIL][87] ([i915#1188]) -> [PASS][88]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-skl2/igt@kms_hdr@bpc-switch-dpms.html
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-skl7/igt@kms_hdr@bpc-switch-dpms.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-apl: [DMESG-WARN][89] ([i915#180]) -> [PASS][90]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-apl1/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-apl1/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [FAIL][91] ([fdo#108145] / [i915#265]) -> [PASS][92] +1 similar issue
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-skl7/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-skl9/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [SKIP][93] ([fdo#109441]) -> [PASS][94] +1 similar issue
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-iclb1/igt@kms_psr@psr2_cursor_render.html
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
* igt@perf@blocking:
- shard-skl: [FAIL][95] ([i915#1542]) -> [PASS][96] +1 similar issue
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-skl3/igt@perf@blocking.html
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-skl9/igt@perf@blocking.html
* igt@syncobj_wait@wait-for-submit-snapshot:
- shard-skl: [FAIL][97] ([i915#3515]) -> [PASS][98]
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-skl3/igt@syncobj_wait@wait-for-submit-snapshot.html
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-skl5/igt@syncobj_wait@wait-for-submit-snapshot.html
* igt@sysfs_heartbeat_interval@mixed@vecs0:
- shard-skl: [FAIL][99] ([i915#1731]) -> [PASS][100]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-skl4/igt@sysfs_heartbeat_interval@mixed@vecs0.html
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-skl3/igt@sysfs_heartbeat_interval@mixed@vecs0.html
#### Warnings ####
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][101] ([i915#658]) -> [SKIP][102] ([i915#588])
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-iclb1/igt@i915_pm_dc@dc3co-vpb-simulation.html
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-iclb2/igt@i915_pm_dc@dc3co-vpb-simulation.html
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [INCOMPLETE][103] ([i915#3698]) -> [INCOMPLETE][104] ([i915#1982] / [i915#3698])
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-iclb2/igt@i915_pm_dc@dc6-psr.html
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-iclb6/igt@i915_pm_dc@dc6-psr.html
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: [WARN][105] ([i915#1804] / [i915#2684]) -> [WARN][106] ([i915#2684])
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-iclb7/igt@i915_pm_rc6_residency@rc6-fence.html
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-iclb2/igt@i915_pm_rc6_residency@rc6-fence.html
* igt@i915_pm_rc6_residency@rc6-idle:
- shard-iclb: [WARN][107] ([i915#2684]) -> [WARN][108] ([i915#1804] / [i915#2684])
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-iclb1/igt@i915_pm_rc6_residency@rc6-idle.html
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-iclb3/igt@i915_pm_rc6_residency@rc6-idle.html
* igt@kms_psr2_sf@cursor-plane-update-sf:
- shard-iclb: [SKIP][109] ([i915#658]) -> [SKIP][110] ([i915#2920])
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-iclb1/igt@kms_psr2_sf@cursor-plane-update-sf.html
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-iclb2/igt@kms_psr2_sf@cursor-plane-update-sf.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4:
- shard-iclb: [SKIP][111] ([i915#2920]) -> [SKIP][112] ([i915#658]) +3 similar issues
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-iclb2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4.html
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-iclb1/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4.html
* igt@runner@aborted:
- shard-kbl: ([FAIL][113], [FAIL][114], [FAIL][115], [FAIL][116], [FAIL][117], [FAIL][118], [FAIL][119], [FAIL][120]) ([i915#1436] / [i915#180] / [i915#1814] / [i915#3002] / [i915#3363]) -> ([FAIL][121], [FAIL][122], [FAIL][123], [FAIL][124], [FAIL][125], [FAIL][126], [FAIL][127], [FAIL][128], [FAIL][129], [FAIL][130]) ([i915#180] / [i915#1814] / [i915#2505] / [i915#3002] / [i915#3363] / [i915#602])
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-kbl4/igt@runner@aborted.html
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-kbl7/igt@runner@aborted.html
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-kbl3/igt@runner@aborted.html
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-kbl7/igt@runner@aborted.html
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-kbl7/igt@runner@aborted.html
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-kbl2/igt@runner@aborted.html
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-kbl1/igt@runner@aborted.html
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-kbl7/igt@runner@aborted.html
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-kbl1/igt@runner@aborted.html
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-kbl7/igt@runner@aborted.html
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-kbl4/igt@runner@aborted.html
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-kbl1/igt@runner@aborted.html
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-kbl2/igt@runner@aborted.html
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-kbl6/igt@runner@aborted.html
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-kbl2/igt@runner@aborted.html
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-kbl1/igt@runner@aborted.html
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-kbl1/igt@runner@aborted.html
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-kbl2/igt@runner@aborted.html
- shard-apl: ([FAIL][131], [FAIL][132], [FAIL][133]) ([fdo#109271] / [i915#180] / [i915#1814] / [i915#3363]) -> ([FAIL][134], [FAIL][135]) ([i915#180] / [i915#3002] / [i915#3363])
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-apl1/igt@runner@aborted.html
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-apl8/igt@runner@aborted.html
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-apl8/igt@runner@aborted.html
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-apl2/igt@runner@aborted.html
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-apl6/igt@runner@aborted.html
- shard-tglb: ([FAIL][136], [FAIL][137]) ([i915#3002]) -> ([FAIL][138], [FAIL][139], [FAIL][140]) ([i915#2426] / [i915#3002] / [i915#3690] / [i915#409])
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-tglb2/igt@runner@aborted.html
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10287/shard-tglb6/igt@runner@aborted.html
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-tglb5/igt@runner@aborted.html
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-tglb7/igt@runner@aborted.html
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/shard-tglb6/igt@runner@aborted.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1099]: https://gitlab.freedesktop.org/drm/intel/issues/1099
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#1731]: https://gitlab.freedesktop.org/drm/intel/issues/1731
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1804]: https://gitlab.freedesktop.org/drm/intel/issues/1804
[i915#1814]: https://gitlab.freedesktop.org/drm/intel/issues/1814
[i915#1937]: https://gitlab.freedesktop.org/drm/intel/issues/1937
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2369]: https://gitlab.freedesktop.org/drm/intel/issues/2369
[i915#2410]: https://gitlab.freedesktop.org/drm/intel/issues/2410
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2505]: https://gitlab.freedesktop.org/drm/intel/issues/2505
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2684]: https://gitlab.freedesktop.org/drm/intel/issues/2684
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3002]: https://gitlab.freedesktop.org/drm/intel/issues/3002
[i915#3063]: https://gitlab.freedesktop.org/drm/intel/issues/3063
[i915#307]: https://gitlab.freedesktop.org/drm/intel/issues/307
[i915#3296]: https://gitlab.freedesktop.org/drm/intel/issues/3296
[i915#3323]: https://gitlab.freedesktop.org/drm/intel/issues/3323
[i915#3363]: https://gitlab.freedesktop.org/drm/intel/issues/3363
[i915#3515]: https://gitlab.freedesktop.org/drm/intel/issues/3515
[i915#3621]: https://gitlab.freedesktop.org/drm/intel/issues/3621
[i915#3690]: https://gitlab.freedesktop.org/drm/intel/issues/3690
[i915#3698]: https://gitlab.freedesktop.org/drm/intel/issues/3698
[i915#409]: https://gitlab.freedesktop.org/drm/intel/issues/409
[i915#51]: https://gitlab.freedesktop.org/drm/intel/issues/51
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#588]: https://gitlab.freedesktop.org/drm/intel/issues/588
[i915#602]: https://gitlab.freedesktop.org/drm/intel/issues/602
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (11 -> 10)
------------------------------
Missing (1): shard-rkl
Build changes
-------------
* Linux: CI_DRM_10287 -> Patchwork_20486
CI-20190529: 20190529
CI_DRM_10287: b6886aad3645be843b71bc508110ab7f974fd41d @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6121: a63ceb48e6c3e733d04156b32fba3b4f4d5ad794 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_20486: bdaa421adb1693aae2d9a3e9f8e0aa2d740b65c6 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20486/index.html
[-- Attachment #1.2: Type: text/html, Size: 37707 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/aperture: Pass DRM driver structure instead of driver name
2021-06-29 13:58 [Intel-gfx] [PATCH] drm/aperture: Pass DRM driver structure instead of driver name Thomas Zimmermann
` (5 preceding siblings ...)
2021-06-29 17:31 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for " Patchwork
@ 2021-08-05 20:37 ` Dmitry Baryshkov
6 siblings, 0 replies; 8+ messages in thread
From: Dmitry Baryshkov @ 2021-08-05 20:37 UTC (permalink / raw)
To: Thomas Zimmermann, daniel, airlied
Cc: dri-devel, linux-tegra, linux-sunxi, linux-rockchip, spice-devel,
nouveau, freedreno, linux-arm-msm, linux-arm-kernel,
linux-amlogic, intel-gfx, virtualization, linux-hyperv, amd-gfx
On 29/06/2021 16:58, Thomas Zimmermann wrote:
> Print the name of the DRM driver when taking over fbdev devices. Makes
> the output to dmesg more consistent. Note that the driver name is only
> used for printing a string to the kernel log. No UAPI is affected by this
> change.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
[...]
> drivers/gpu/drm/msm/msm_fbdev.c | 2 +-
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +-
> drivers/gpu/drm/qxl/qxl_drv.c | 2 +-
> drivers/gpu/drm/radeon/radeon_drv.c | 2 +-
> drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +-
> drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +-
> drivers/gpu/drm/tegra/drm.c | 2 +-
> drivers/gpu/drm/tiny/cirrus.c | 2 +-
> drivers/gpu/drm/vboxvideo/vbox_drv.c | 2 +-
> drivers/gpu/drm/vc4/vc4_drv.c | 2 +-
> drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +-
> include/drm/drm_aperture.h | 14 +++++++++-----
> 23 files changed, 43 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> index 6f30c525caac..accf9c1b967a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> @@ -1278,7 +1278,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
> #endif
>
> /* Get rid of things like offb */
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "amdgpudrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &amdgpu_kms_driver);
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
> index dab0a1f0983b..31925ae3ab72 100644
> --- a/drivers/gpu/drm/armada/armada_drv.c
> +++ b/drivers/gpu/drm/armada/armada_drv.c
> @@ -95,7 +95,7 @@ static int armada_drm_bind(struct device *dev)
> }
>
> /* Remove early framebuffers */
> - ret = drm_aperture_remove_framebuffers(false, "armada-drm-fb");
> + ret = drm_aperture_remove_framebuffers(false, &armada_drm_driver);
> if (ret) {
> dev_err(dev, "[" DRM_NAME ":%s] can't kick out simple-fb: %d\n",
> __func__, ret);
> diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
> index 5aa452b4efe6..86d5cd7b6318 100644
> --- a/drivers/gpu/drm/ast/ast_drv.c
> +++ b/drivers/gpu/drm/ast/ast_drv.c
> @@ -100,7 +100,7 @@ static int ast_remove_conflicting_framebuffers(struct pci_dev *pdev)
> primary = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;
> #endif
>
> - return drm_aperture_remove_conflicting_framebuffers(base, size, primary, "astdrmfb");
> + return drm_aperture_remove_conflicting_framebuffers(base, size, primary, &ast_driver);
> }
>
> static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c
> index c828cadbabff..0d232b44ecd7 100644
> --- a/drivers/gpu/drm/bochs/bochs_drv.c
> +++ b/drivers/gpu/drm/bochs/bochs_drv.c
> @@ -110,7 +110,7 @@ static int bochs_pci_probe(struct pci_dev *pdev,
> return -ENOMEM;
> }
>
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "bochsdrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &bochs_driver);
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/drm_aperture.c b/drivers/gpu/drm/drm_aperture.c
> index 9335d9d6cf9a..9ac39cf11694 100644
> --- a/drivers/gpu/drm/drm_aperture.c
> +++ b/drivers/gpu/drm/drm_aperture.c
> @@ -33,6 +33,10 @@
> *
> * .. code-block:: c
> *
> + * static const struct drm_driver example_driver = {
> + * ...
> + * };
> + *
> * static int remove_conflicting_framebuffers(struct pci_dev *pdev)
> * {
> * bool primary = false;
> @@ -46,7 +50,7 @@
> * #endif
> *
> * return drm_aperture_remove_conflicting_framebuffers(base, size, primary,
> - * "example driver");
> + * &example_driver);
> * }
> *
> * static int probe(struct pci_dev *pdev)
> @@ -274,7 +278,7 @@ static void drm_aperture_detach_drivers(resource_size_t base, resource_size_t si
> * @base: the aperture's base address in physical memory
> * @size: aperture size in bytes
> * @primary: also kick vga16fb if present
> - * @name: requesting driver name
> + * @req_driver: requesting DRM driver
> *
> * This function removes graphics device drivers which use memory range described by
> * @base and @size.
> @@ -283,7 +287,7 @@ static void drm_aperture_detach_drivers(resource_size_t base, resource_size_t si
> * 0 on success, or a negative errno code otherwise
> */
> int drm_aperture_remove_conflicting_framebuffers(resource_size_t base, resource_size_t size,
> - bool primary, const char *name)
> + bool primary, const struct drm_driver *req_driver)
> {
> #if IS_REACHABLE(CONFIG_FB)
> struct apertures_struct *a;
> @@ -296,7 +300,7 @@ int drm_aperture_remove_conflicting_framebuffers(resource_size_t base, resource_
> a->ranges[0].base = base;
> a->ranges[0].size = size;
>
> - ret = remove_conflicting_framebuffers(a, name, primary);
> + ret = remove_conflicting_framebuffers(a, req_driver->name, primary);
> kfree(a);
>
> if (ret)
> @@ -312,7 +316,7 @@ EXPORT_SYMBOL(drm_aperture_remove_conflicting_framebuffers);
> /**
> * drm_aperture_remove_conflicting_pci_framebuffers - remove existing framebuffers for PCI devices
> * @pdev: PCI device
> - * @name: requesting driver name
> + * @req_driver: requesting DRM driver
> *
> * This function removes graphics device drivers using memory range configured
> * for any of @pdev's memory bars. The function assumes that PCI device with
> @@ -321,7 +325,8 @@ EXPORT_SYMBOL(drm_aperture_remove_conflicting_framebuffers);
> * Returns:
> * 0 on success, or a negative errno code otherwise
> */
> -int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev, const char *name)
> +int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev,
> + const struct drm_driver *req_driver)
> {
> resource_size_t base, size;
> int bar, ret = 0;
> @@ -339,7 +344,7 @@ int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev, const
> * otherwise the vga fbdev driver falls over.
> */
> #if IS_REACHABLE(CONFIG_FB)
> - ret = remove_conflicting_pci_framebuffers(pdev, name);
> + ret = remove_conflicting_pci_framebuffers(pdev, req_driver->name);
> #endif
> if (ret == 0)
> ret = vga_remove_vgacon(pdev);
> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> index f4bc5386574a..6f0297b854f2 100644
> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> @@ -314,7 +314,7 @@ static int hibmc_pci_probe(struct pci_dev *pdev,
> struct drm_device *dev;
> int ret;
>
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "hibmcdrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &hibmc_driver);
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c
> index eb06c92c4bfd..cd818a629183 100644
> --- a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c
> +++ b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c
> @@ -82,7 +82,7 @@ static int hyperv_setup_gen1(struct hyperv_drm_device *hv)
> return -ENODEV;
> }
>
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "hypervdrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &hyperv_driver);
> if (ret) {
> drm_err(dev, "Not able to remove boot fb\n");
> return ret;
> @@ -127,7 +127,7 @@ static int hyperv_setup_gen2(struct hyperv_drm_device *hv,
> drm_aperture_remove_conflicting_framebuffers(screen_info.lfb_base,
> screen_info.lfb_size,
> false,
> - "hypervdrmfb");
> + &hyperv_driver);
>
> hv->fb_size = (unsigned long)hv->mmio_megabytes * 1024 * 1024;
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 850b499c71c8..62327c15f457 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -562,7 +562,7 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
> if (ret)
> goto err_perf;
>
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "inteldrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, dev_priv->drm.driver);
> if (ret)
> goto err_ggtt;
>
> diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
> index a7388bf7c838..3d0ccc7eef1b 100644
> --- a/drivers/gpu/drm/meson/meson_drv.c
> +++ b/drivers/gpu/drm/meson/meson_drv.c
> @@ -285,7 +285,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
> * Remove early framebuffers (ie. simplefb). The framebuffer can be
> * located anywhere in RAM
> */
> - ret = drm_aperture_remove_framebuffers(false, "meson-drm-fb");
> + ret = drm_aperture_remove_framebuffers(false, &meson_driver);
> if (ret)
> goto free_drm;
>
> diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
> index a701d9563257..36d1bfb3213f 100644
> --- a/drivers/gpu/drm/mgag200/mgag200_drv.c
> +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
> @@ -342,7 +342,7 @@ mgag200_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> struct drm_device *dev;
> int ret;
>
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "mgag200drmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &mgag200_driver);
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
> index 227404077e39..67fae60f2fa5 100644
> --- a/drivers/gpu/drm/msm/msm_fbdev.c
> +++ b/drivers/gpu/drm/msm/msm_fbdev.c
> @@ -169,7 +169,7 @@ struct drm_fb_helper *msm_fbdev_init(struct drm_device *dev)
> }
>
> /* the fw fb could be anywhere in memory */
> - ret = drm_aperture_remove_framebuffers(false, "msm");
> + ret = drm_aperture_remove_framebuffers(false, dev->driver);
> if (ret)
> goto fini;
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
> index a616cf4573b8..df8a2d92f473 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_drm.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
> @@ -738,7 +738,7 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
> nvkm_device_del(&device);
>
> /* Remove conflicting drivers (vesafb, efifb etc). */
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "nouveaufb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver_pci);
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c
> index 854e6c5a563f..31f4c86ceb99 100644
> --- a/drivers/gpu/drm/qxl/qxl_drv.c
> +++ b/drivers/gpu/drm/qxl/qxl_drv.c
> @@ -95,7 +95,7 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> if (ret)
> return ret;
>
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "qxl");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &qxl_driver);
> if (ret)
> goto disable_pci;
>
> diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
> index 8cd135fa6dcd..82ee8244c9b3 100644
> --- a/drivers/gpu/drm/radeon/radeon_drv.c
> +++ b/drivers/gpu/drm/radeon/radeon_drv.c
> @@ -330,7 +330,7 @@ static int radeon_pci_probe(struct pci_dev *pdev,
> return -EPROBE_DEFER;
>
> /* Get rid of things like offb */
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "radeondrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &kms_driver);
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> index b730b8d5d949..17a189bb6bbc 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> @@ -116,7 +116,7 @@ static int rockchip_drm_bind(struct device *dev)
> int ret;
>
> /* Remove existing drivers that may own the framebuffer memory. */
> - ret = drm_aperture_remove_framebuffers(false, "rockchip-drm-fb");
> + ret = drm_aperture_remove_framebuffers(false, &rockchip_drm_driver);
> if (ret) {
> DRM_DEV_ERROR(dev,
> "Failed to remove existing framebuffers - %d.\n",
> diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
> index af335f58bdfc..6bc1c8d6d43b 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_drv.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
> @@ -100,7 +100,7 @@ static int sun4i_drv_bind(struct device *dev)
> drm->irq_enabled = true;
>
> /* Remove early framebuffers (ie. simplefb) */
> - ret = drm_aperture_remove_framebuffers(false, "sun4i-drm-fb");
> + ret = drm_aperture_remove_framebuffers(false, &sun4i_drv_driver);
> if (ret)
> goto cleanup_mode_config;
>
> diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
> index f96c237b2242..2c8fc14bba1f 100644
> --- a/drivers/gpu/drm/tegra/drm.c
> +++ b/drivers/gpu/drm/tegra/drm.c
> @@ -1204,7 +1204,7 @@ static int host1x_drm_probe(struct host1x_device *dev)
>
> drm_mode_config_reset(drm);
>
> - err = drm_aperture_remove_framebuffers(false, "tegradrmfb");
> + err = drm_aperture_remove_framebuffers(false, &tegra_drm_driver);
> if (err < 0)
> goto hub;
>
> diff --git a/drivers/gpu/drm/tiny/cirrus.c b/drivers/gpu/drm/tiny/cirrus.c
> index 42611dacde88..a8b476a59c0d 100644
> --- a/drivers/gpu/drm/tiny/cirrus.c
> +++ b/drivers/gpu/drm/tiny/cirrus.c
> @@ -550,7 +550,7 @@ static int cirrus_pci_probe(struct pci_dev *pdev,
> struct cirrus_device *cirrus;
> int ret;
>
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "cirrusdrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &cirrus_driver);
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/vboxvideo/vbox_drv.c b/drivers/gpu/drm/vboxvideo/vbox_drv.c
> index 6d4b32da9866..879a2445cc44 100644
> --- a/drivers/gpu/drm/vboxvideo/vbox_drv.c
> +++ b/drivers/gpu/drm/vboxvideo/vbox_drv.c
> @@ -43,7 +43,7 @@ static int vbox_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> if (!vbox_check_supported(VBE_DISPI_ID_HGSMI))
> return -ENODEV;
>
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "vboxvideodrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
> index 8a60fb8ad370..73335feb712f 100644
> --- a/drivers/gpu/drm/vc4/vc4_drv.c
> +++ b/drivers/gpu/drm/vc4/vc4_drv.c
> @@ -265,7 +265,7 @@ static int vc4_drm_bind(struct device *dev)
> if (ret)
> goto unbind_all;
>
> - ret = drm_aperture_remove_framebuffers(false, "vc4drmfb");
> + ret = drm_aperture_remove_framebuffers(false, &vc4_drm_driver);
> if (ret)
> goto unbind_all;
>
> diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c
> index ca77edbc5ea0..ed85a7863256 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_drv.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c
> @@ -57,7 +57,7 @@ static int virtio_gpu_pci_quirk(struct drm_device *dev, struct virtio_device *vd
> vga ? "virtio-vga" : "virtio-gpu-pci",
> pname);
> if (vga) {
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "virtiodrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);
> if (ret)
> return ret;
> }
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> index 086dc75e7b42..40864ce19ae1 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> @@ -1574,7 +1574,7 @@ static int vmw_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> struct vmw_private *vmw;
> int ret;
>
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "svgadrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);
> if (ret)
> return ret;
>
> diff --git a/include/drm/drm_aperture.h b/include/drm/drm_aperture.h
> index 6c148078780c..7096703c3949 100644
> --- a/include/drm/drm_aperture.h
> +++ b/include/drm/drm_aperture.h
> @@ -6,20 +6,22 @@
> #include <linux/types.h>
>
> struct drm_device;
> +struct drm_driver;
> struct pci_dev;
>
> int devm_aperture_acquire_from_firmware(struct drm_device *dev, resource_size_t base,
> resource_size_t size);
>
> int drm_aperture_remove_conflicting_framebuffers(resource_size_t base, resource_size_t size,
> - bool primary, const char *name);
> + bool primary, const struct drm_driver *req_driver);
>
> -int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev, const char *name);
> +int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev,
> + const struct drm_driver *req_driver);
>
> /**
> * drm_aperture_remove_framebuffers - remove all existing framebuffers
> * @primary: also kick vga16fb if present
> - * @name: requesting driver name
> + * @req_driver: requesting DRM driver
> *
> * This function removes all graphics device drivers. Use this function on systems
> * that can have their framebuffer located anywhere in memory.
> @@ -27,9 +29,11 @@ int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev, const
> * Returns:
> * 0 on success, or a negative errno code otherwise
> */
> -static inline int drm_aperture_remove_framebuffers(bool primary, const char *name)
> +static inline int
> +drm_aperture_remove_framebuffers(bool primary, const struct drm_driver *req_driver)
> {
> - return drm_aperture_remove_conflicting_framebuffers(0, (resource_size_t)-1, primary, name);
> + return drm_aperture_remove_conflicting_framebuffers(0, (resource_size_t)-1, primary,
> + req_driver);
> }
>
> #endif
>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-08-05 21:29 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-29 13:58 [Intel-gfx] [PATCH] drm/aperture: Pass DRM driver structure instead of driver name Thomas Zimmermann
2021-06-29 14:58 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2021-06-29 15:28 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-06-29 15:32 ` [Intel-gfx] [PATCH] " Das, Nirmoy
2021-06-29 15:59 ` Chen-Yu Tsai
2021-06-29 17:03 ` Neil Armstrong
2021-06-29 17:31 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for " Patchwork
2021-08-05 20:37 ` [Intel-gfx] [PATCH] " Dmitry Baryshkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).