[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/v3d/v3d_gem.c: In function 'v3d_submit_tfu_ioctl': drivers/gpu/drm/v3d/v3d_gem.c:719:3: error: too many arguments to function 'drm_syncobj_replace_fence' drm_syncobj_replace_fence(sync_out, 0, sched_done_fence); ^ In file included from drivers/gpu/drm/v3d/v3d_gem.c:5: include/drm/drm_syncobj.h:134:6: note: declared here void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, ^ Caused by commit 0b258ed1a219 ("drm: revert "expand replace_fence to support timeline point v2"") interacting with commit 1584f16ca96e ("drm/v3d: Add support for submitting jobs to the TFU") I have used the drm-misc tree from next-20181205 for today. -- Cheers, Stephen Rothwell pgpmHXGJ5NpjN.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_mode_config_init': drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1695:30: error: passing argument 1 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types] drm_atomic_private_obj_init(&adev->dm.atomic_obj, ^~~~ In file included from include/drm/drm_dp_mst_helper.h:27, from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46, from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57, from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34: include/drm/drm_atomic.h:437:53: note: expected 'struct drm_device *' but argument is of type 'struct drm_private_obj *' void drm_atomic_private_obj_init(struct drm_device *dev, ~~~^~~ drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1696:9: error: passing argument 2 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types] &state->base, ^~~~ In file included from include/drm/drm_dp_mst_helper.h:27, from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46, from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57, from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34: include/drm/drm_atomic.h:438:30: note: expected 'struct drm_private_obj *' but argument is of type 'struct drm_private_state *' struct drm_private_obj *obj, ^~~ drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1697:9: error: passing argument 3 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types] &dm_atomic_state_funcs); ^~ In file included from include/drm/drm_dp_mst_helper.h:27, from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46, from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57, from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34: include/drm/drm_atomic.h:439:32: note: expected 'struct drm_private_state *' but argument is of type 'struct drm_private_state_funcs *' struct drm_private_state *state, ~~^ drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1695:2: error: too few arguments to function 'drm_atomic_private_obj_init' drm_atomic_private_obj_init(&adev->dm.atomic_obj, ^~~ In file included from include/drm/drm_dp_mst_helper.h:27, from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46, from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57, from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34: include/drm/drm_atomic.h:437:6: note: declared here void drm_atomic_private_obj_init(struct drm_device *dev, ^~~ Caused by commit b962a12050a3 ("drm/atomic: integrate modeset lock with private objects") interacting with commit eb3dc8978596 ("drm/amd/display: Use private obj helpers for dm_atomic_state") from Linus' tree (merged during the merge window). Its not obvious how to fix this up, so I have used the drm-misc tree from next-20190107 for today. -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: ERROR: "depot_save_stack" [drivers/gpu/drm/drm.ko] undefined! ERROR: "depot_fetch_stack" [drivers/gpu/drm/drm.ko] undefined! Caused by commit 5705670d0463 ("drm: Track drm_mm allocators and show leaks on shutdown") I hate used the drm-misc tree from next-20161108 for today. -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from drivers/gpu/drm/i915/intel_drv.h:32:0, from drivers/gpu/drm/i915/intel_display.c:36: drivers/gpu/drm/i915/intel_display.c: In function 'intel_primary_plane_create': drivers/gpu/drm/i915/i915_drv.h:2601:40: error: 'struct drm_device' has no member named 'info' #define INTEL_GEN(dev_priv) ((dev_priv)->info.gen) ^ drivers/gpu/drm/i915/intel_display.c:15077:6: note: in expansion of macro 'INTEL_GEN' if (INTEL_GEN(dev) >= 9) { ^ drivers/gpu/drm/i915/i915_drv.h:2601:40: error: 'struct drm_device' has no member named 'info' #define INTEL_GEN(dev_priv) ((dev_priv)->info.gen) ^ drivers/gpu/drm/i915/intel_display.c:15081:13: note: in expansion of macro 'INTEL_GEN' } else if (INTEL_GEN(dev) >= 4) { ^ drivers/gpu/drm/i915/i915_drv.h:2601:40: error: 'struct drm_device' has no member named 'info' #define INTEL_GEN(dev_priv) ((dev_priv)->info.gen) ^ drivers/gpu/drm/i915/intel_display.c:15088:6: note: in expansion of macro 'INTEL_GEN' if (INTEL_GEN(dev) >= 4) ^ drivers/gpu/drm/i915/intel_display.c: In function 'intel_cursor_plane_create': drivers/gpu/drm/i915/i915_drv.h:2601:40: error: 'struct drm_device' has no member named 'info' #define INTEL_GEN(dev_priv) ((dev_priv)->info.gen) ^ drivers/gpu/drm/i915/intel_display.c:15231:6: note: in expansion of macro 'INTEL_GEN' if (INTEL_GEN(dev) >= 4) ^ Caused by commit 93ca7e006670 ("drm/i915: Use the per-plane rotation property") interacting with commit 55b8f2a76dff ("drm/i915: Make INTEL_GEN only take dev_priv") from the drm-intel tree. I added this merge fix patch: From 3d8024ddc9cd584e23e9ff4845a46475972c3d36 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 24 Oct 2016 11:12:05 +1100 Subject: [PATCH] drm/i915: merge fix for INTEL_GEN API change Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/i915/intel_display.c | 9 + drivers/gpu/drm/i915/intel_sprite.c | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c2a8df968b03..89d73ab020e7 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -15074,18 +15074,18 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev, if (ret) goto fail; - if (INTEL_GEN(dev) >= 9) { + if (INTEL_GEN(dev_priv) >= 9) { supported_rotations = DRM_ROTATE_0 | DRM_ROTATE_90 | DRM_ROTATE_180 | DRM_ROTATE_270; - } else if (INTEL_GEN(dev) >= 4) { + } else if (INTEL_GEN(dev_priv) >= 4) { supported_rotations = DRM_ROTATE_0 | DRM_ROTATE_180; } else { supported_rotations = DRM_ROTATE_0; } - if (INTEL_GEN(dev) >= 4) + if (INTEL_GEN(dev_priv) >= 4) drm_plane_create_rotation_property(&primary->base, DRM_ROTATE_0, supported_rotations); @@ -15199,6 +15199,7 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev, { struct intel_plane *cursor = NULL; struct intel_plane_state *state = NULL; + struct drm_i915_private *dev_priv = to_i915(dev); int ret; cursor = kzalloc(sizeof(*cursor), GFP_KERNEL); @@ -15228,7 +15229,7 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev, if (ret) goto fail; - if (INTEL_GEN(dev) >= 4) + if (INTEL_GEN(dev_priv) >= 4) drm_plane_create_rotation_property(&cursor->base, DRM_ROTATE_0, DRM_ROTATE_0 | diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 9436d041389f..43d0350856e7 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -1126,7 +1126,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) goto fail; } - if (INTEL_GEN(dev) >= 9) { + if (INTEL_GEN(dev_priv) >= 9) { supported_rotations = DRM_ROTATE_0 | DRM_ROTATE_90 | DRM_ROTATE_180 | DRM_ROTATE_270; -- 2.8.1 -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (arm multi_v7_defconfig) failed like this: drivers/usb/Kconfig:39:error: recursive dependency detected! drivers/usb/Kconfig:39: symbol USB is selected by MOUSE_APPLETOUCH drivers/input/mouse/Kconfig:187:symbol MOUSE_APPLETOUCH depends on INPUT drivers/input/Kconfig:8:symbol INPUT is selected by VT drivers/tty/Kconfig:12: symbol VT is selected by FB_STI drivers/video/fbdev/Kconfig:678:symbol FB_STI depends on FB drivers/video/fbdev/Kconfig:5: symbol FB is selected by DRM_KMS_FB_HELPER drivers/gpu/drm/Kconfig:72: symbol DRM_KMS_FB_HELPER depends on DRM_KMS_HELPER drivers/gpu/drm/Kconfig:66: symbol DRM_KMS_HELPER is selected by DRM_NOUVEAU drivers/gpu/drm/nouveau/Kconfig:1: symbol DRM_NOUVEAU depends on LEDS_CLASS drivers/leds/Kconfig:16:symbol LEDS_CLASS is selected by OMAP_DEBUG_LEDS arch/arm/plat-omap/Kconfig:19: symbol OMAP_DEBUG_LEDS depends on NEW_LEDS drivers/leds/Kconfig:8: symbol NEW_LEDS is selected by ATH9K_HTC drivers/net/wireless/ath/ath9k/Kconfig:158: symbol ATH9K_HTC depends on USB Caused by commit a5ad0fd8524e ("drm: nouveau: fix build when LEDS_CLASS=m") I have reverted that commit for today (just because I had to to make sure that was the problem). -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/i2c/tda998x_drv.c:1354:2: error: unknown field 'save' specified in initializer .save = tda998x_encoder_save, ^ drivers/gpu/drm/i2c/tda998x_drv.c:1354:10: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types] .save = tda998x_encoder_save, ^ drivers/gpu/drm/i2c/tda998x_drv.c:1354:10: note: (near initialization for 'tda998x_encoder_helper_funcs.mode_fixup') drivers/gpu/drm/i2c/tda998x_drv.c:1355:2: error: unknown field 'restore' specified in initializer .restore = tda998x_encoder_restore, ^ Caused by commit 79f13ad5d8e0 ("drm: Move encoder->save/restore into nouveau") I have used the drm-misc tree from next-20151207 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (arm multi_v7_defconfig) failed like this: In file included from drivers/gpu/drm/nouveau/nouveau_drm.c:25:0: include/linux/apple-gmux.h: In function 'apple_gmux_present': include/linux/apple-gmux.h:36:42: error: implicit declaration of function 'acpi_dev_present' [-Werror=implicit-function-declaration] return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID); ^ Caused by commit 2413306c2566 ("apple-gmux: Add helper for presence detect") I have used the drm-misc tree from next-20160209 for today. -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/virtio/virtgpu_drm_bus.c: In function 'virtio_pci_kick_out_firmware_fb': drivers/gpu/drm/virtio/virtgpu_drm_bus.c:55:2: error: implicit declaration of function 'drm_fb_helper_remove_conflicting_framebuffers' [-Werror=implicit-function-declaration] drm_fb_helper_remove_conflicting_framebuffers(ap, "virtiodrmfb", ^ Caused by commit 7bd870e7b1c8 ("drm/virtio: Use new drm_fb_helper functions") I have used the drm-misc tree from next-20150713 for today. (That commit said "COMPILE TESTED ONLY" :-() -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp5cB7wGZvSm.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: ERROR: "drm_agp_release" [drivers/gpu/drm/radeon/radeon.ko] undefined! ERROR: "drm_agp_acquire" [drivers/gpu/drm/radeon/radeon.ko] undefined! ERROR: "drm_agp_enable" [drivers/gpu/drm/radeon/radeon.ko] undefined! ERROR: "drm_agp_info" [drivers/gpu/drm/radeon/radeon.ko] undefined! ERROR: "drm_agp_release" [drivers/gpu/drm/mga/mga.ko] undefined! ERROR: "drm_agp_acquire" [drivers/gpu/drm/mga/mga.ko] undefined! ERROR: "drm_agp_free" [drivers/gpu/drm/mga/mga.ko] undefined! ERROR: "drm_agp_bind" [drivers/gpu/drm/mga/mga.ko] undefined! ERROR: "drm_agp_unbind" [drivers/gpu/drm/mga/mga.ko] undefined! ERROR: "drm_agp_alloc" [drivers/gpu/drm/mga/mga.ko] undefined! ERROR: "drm_agp_enable" [drivers/gpu/drm/mga/mga.ko] undefined! ERROR: "drm_agp_info" [drivers/gpu/drm/mga/mga.ko] undefined! ERROR: "drm_agp_unbind_ioctl" [drivers/gpu/drm/drm.ko] undefined! ERROR: "drm_agp_init" [drivers/gpu/drm/drm.ko] undefined! ERROR: "drm_agp_alloc_ioctl" [drivers/gpu/drm/drm.ko] undefined! ERROR: "drm_agp_clear" [drivers/gpu/drm/drm.ko] undefined! ERROR: "drm_agp_info_ioctl" [drivers/gpu/drm/drm.ko] undefined! ERROR: "drm_agp_enable_ioctl" [drivers/gpu/drm/drm.ko] undefined! ERROR: "drm_agp_release_ioctl" [drivers/gpu/drm/drm.ko] undefined! ERROR: "drm_agp_bind_ioctl" [drivers/gpu/drm/drm.ko] undefined! ERROR: "drm_agp_acquire_ioctl" [drivers/gpu/drm/drm.ko] undefined! ERROR: "drm_agp_free_ioctl" [drivers/gpu/drm/drm.ko] undefined! Not quite sure which commit caused this, but I have used the drm-misc tree from next-20150930 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (arm multi_v7_defconfig) failed like this: drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: In function 'mdp5_plane_cleanup_fb': drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:272:26: error: 'fb' redeclared as different kind of symbol struct drm_framebuffer *fb = old_state->fb; ^ drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:267:27: note: previous definition of 'fb' was here struct drm_framebuffer *fb, ^ drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: At top level: drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: initialization from incompatible pointer type .cleanup_fb = mdp5_plane_cleanup_fb, ^ drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: (near initialization for 'mdp5_plane_helper_funcs.cleanup_fb') Caused by commit a317290af0db ("drm/atomic: Make prepare_fb/cleanup_fb only take state, v3") Well, that was clearly never build tested :-( I have used the drm-misc tree from next-20150902 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: Caused by commit b6dcaaac4474 ("drm/vblank: _ioctl posfix for ioctl handler") interacting with commit d5288c88c67c ("switch compat_drm_wait_vblank() to drm_ioctl_kernel()") from Linus' tree. You should consider rebasing your branch onto v4.13-rc1 (or merging v4.13-rc1) so that these (unnecessary) conflicts don't keep happening during development and the next merge window. I have applied the following merge fix patch for today. From: Stephen Rothwell Date: Tue, 18 Jul 2017 11:35:10 +1000 Subject: [PATCH] drm/vblank: fix for "switch compat_drm_wait_vblank() to drm_ioctl_kernel()" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/drm_ioc32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c index d1f202852028..f8e96e648acf 100644 --- a/drivers/gpu/drm/drm_ioc32.c +++ b/drivers/gpu/drm/drm_ioc32.c @@ -842,7 +842,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd, req.request.type = req32.request.type; req.request.sequence = req32.request.sequence; req.request.signal = req32.request.signal; - err = drm_ioctl_kernel(file, drm_wait_vblank, &req, DRM_UNLOCKED); + err = drm_ioctl_kernel(file, drm_wait_vblank_ioctl, &req, DRM_UNLOCKED); if (err) return err; -- 2.13.2 -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/staging/vboxvideo/vbox_drv.c:235:2: error: unknown field 'set_busid' specified in initializer .set_busid = drm_pci_set_busid, ^ drivers/staging/vboxvideo/vbox_drv.c:235:15: error: 'drm_pci_set_busid' undeclared here (not in a function) .set_busid = drm_pci_set_busid, ^ drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_init': drivers/staging/vboxvideo/vbox_drv.c:273:9: error: implicit declaration of function 'drm_pci_init' [-Werror=implicit-function-declaration] return drm_pci_init(&driver, &vbox_pci_driver); ^ drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_exit': drivers/staging/vboxvideo/vbox_drv.c:278:2: error: implicit declaration of function 'drm_pci_exit' [-Werror=implicit-function-declaration] drm_pci_exit(&driver, &vbox_pci_driver); ^ Caused by commits 5c484cee7ef9 ("drm: Remove drm_driver->set_busid hook") 10631d724def ("drm/pci: Deprecate drm_pci_init/exit completely") interacting with commit dd55d44f4084 ("staging: vboxvideo: Add vboxvideo to drivers/staging") from the staging.current tree. I have applied the following merge fix patch - please check that it is correct. From: Stephen Rothwell Date: Wed, 19 Jul 2017 11:41:01 +1000 Subject: [PATCH] drm: fixes for staging due to API changes in the drm core Signed-off-by: Stephen Rothwell --- drivers/staging/vboxvideo/vbox_drv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/vboxvideo/vbox_drv.c b/drivers/staging/vboxvideo/vbox_drv.c index 92ae1560a16d..6d0600c37c0c 100644 --- a/drivers/staging/vboxvideo/vbox_drv.c +++ b/drivers/staging/vboxvideo/vbox_drv.c @@ -232,7 +232,6 @@ static struct drm_driver driver = { .lastclose = vbox_driver_lastclose, .master_set = vbox_master_set, .master_drop = vbox_master_drop, - .set_busid = drm_pci_set_busid, .fops = &vbox_fops, .irq_handler = vbox_irq_handler, @@ -270,12 +269,12 @@ static int __init vbox_init(void) if (vbox_modeset == 0) return -EINVAL; - return drm_pci_init(&driver, &vbox_pci_driver); + return pci_register_driver(&vbox_pci_driver); } static void __exit vbox_exit(void) { - drm_pci_exit(&driver, &vbox_pci_driver); + pci_unregister_driver(&vbox_pci_driver); } module_init(vbox_init); -- 2.13.2 -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/i915/intel_dsi.c: In function 'intel_dsi_get_panel_orientation': drivers/gpu/drm/i915/intel_dsi.c:1673:13: error: storage size of 'plane' isn't known enum plane plane; ^ Caused by commit 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.") interacting with commit ed15030d7ab0 ("drm/i915: s/enum plane/enum i9xx_plane_id/") from the drm-intel tree. I have applied the following merge fix patch for today. From: Stephen Rothwell Date: Wed, 6 Dec 2017 11:56:32 +1100 Subject: [PATCH] drm/i915: fix up for "drm/i915: s/enum plane/enum i9xx_plane_id/" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/i915/intel_dsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c index 1b60df3c14a0..f67d321376e4 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c @@ -1670,7 +1670,7 @@ static int intel_dsi_get_panel_orientation(struct intel_connector *connector) { struct drm_i915_private *dev_priv = to_i915(connector->base.dev); int orientation = DRM_MODE_PANEL_ORIENTATION_NORMAL; - enum plane plane; + enum i9xx_plane_id plane; u32 val; if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { -- 2.15.0 -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c: In function 'vmw_sou_crtc_page_flip': drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c:327:8: error: too few arguments to function 'drm_atomic_helper_page_flip' ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags); ^ In file included from drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c:31:0: include/drm/drm_atomic_helper.h:126:5: note: declared here int drm_atomic_helper_page_flip(struct drm_crtc *crtc, ^ drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c: In function 'vmw_stdu_crtc_page_flip': drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c:508:8: error: too few arguments to function 'drm_atomic_helper_page_flip' ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags); ^ In file included from drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c:32:0: include/drm/drm_atomic_helper.h:126:5: note: declared here int drm_atomic_helper_page_flip(struct drm_crtc *crtc, ^ Caused by commit 41292b1fa13a ("drm: Add acquire ctx parameter to ->page_flip(_target)") interacting with commits 904bb5e5817f ("drm/vmwgfx: Switch over to internal atomic API for STDU") b0119cb9229d ("drm/vmwgfx: Switch over to internal atomic API for SOU and LDU") from the drm tree. I added this merge fix patch for today: From: Stephen Rothwell Date: Mon, 3 Apr 2017 13:25:55 +1000 Subject: [PATCH] drm/vmwgfx: merge fixup for page_flip API change Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c index 02b8f2541dca..8d7dc9def7c2 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c @@ -324,7 +324,7 @@ static int vmw_sou_crtc_page_flip(struct drm_crtc *crtc, return -EINVAL; flags &= ~DRM_MODE_PAGE_FLIP_ASYNC; - ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags); + ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags, ctx); if (ret) { DRM_ERROR("Page flip error %d.\n", ret); return ret; diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c index e59bbcd8b226..bad31bdf09b6 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c @@ -505,7 +505,7 @@ static int vmw_stdu_crtc_page_flip(struct drm_crtc *crtc, * don't hand it to the helper. */ flags &= ~DRM_MODE_PAGE_FLIP_ASYNC; - ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags); + ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags, ctx); if (ret) { DRM_ERROR("Page flip error %d.\n", ret); return ret; -- 2.11.0 -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/tee/tee_shm.c:87:2: error: unknown field 'kmap_atomic' specified in initializer .kmap_atomic = tee_shm_op_kmap_atomic, ^ drivers/tee/tee_shm.c:87:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] .kmap_atomic = tee_shm_op_kmap_atomic, ^ drivers/tee/tee_shm.c:87:17: note: (near initialization for 'tee_shm_dma_buf_ops.begin_cpu_access') drivers/tee/tee_shm.c:88:2: error: unknown field 'kmap' specified in initializer .kmap = tee_shm_op_kmap, ^ drivers/tee/tee_shm.c:88:10: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] .kmap = tee_shm_op_kmap, ^ drivers/tee/tee_shm.c:88:10: note: (near initialization for 'tee_shm_dma_buf_ops.end_cpu_access') Caused by commit f9b67f0014cb ("dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro") interacting with commit 967c9cca2cc5 ("tee: generic TEE subsystem") from the arm-soc tree. I applied the following merge fix patch for today: From: Stephen Rothwell Date: Fri, 21 Apr 2017 12:06:32 +1000 Subject: [PATCH] tee: merge fix for dma-ops field name changes Signed-off-by: Stephen Rothwell --- drivers/tee/tee_shm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 0be1e3e93bee..4e14c9c9cb1c 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -84,8 +84,8 @@ static struct dma_buf_ops tee_shm_dma_buf_ops = { .map_dma_buf = tee_shm_op_map_dma_buf, .unmap_dma_buf = tee_shm_op_unmap_dma_buf, .release = tee_shm_op_release, - .kmap_atomic = tee_shm_op_kmap_atomic, - .kmap = tee_shm_op_kmap, + .map_atomic = tee_shm_op_kmap_atomic, + .map = tee_shm_op_kmap, .mmap = tee_shm_op_mmap, }; -- 2.11.0 -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 modules_install) failed like this: depmod: ERROR: Cycle detected: drm_kms_helper -> drm -> drm_kms_helper depmod: ERROR: Cycle detected: cec depmod: ERROR: Found 2 modules in dependency cycles! Caused by commit 87ea95808d53 ("drm/bridge: Add a function to abstract away panels") I have reverted these commits for today: a43dd76bacd0 ("drm/vc4: dsi: Switch to devm_drm_of_get_bridge") 0caddbbfdfa2 ("drm/vc4: dpi: Switch to devm_drm_of_get_bridge") 87ea95808d53 ("drm/bridge: Add a function to abstract away panels") -- Cheers, Stephen Rothwell pgpENuuMeVPxn.pgp Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c: In function 'gp100_vmm_fault_cancel': drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c:491:6: error: unused variable 'inst' [-Werror=unused-variable] 491 | u32 inst, aper; | ^~~~ cc1: all warnings being treated as errors Caused by commit 404046cf4805 ("drm/nouveau/mmu/gp100-: drop unneeded assignment in the if condition.") I have used the drm-misc tree from next-20211011 for today. -- Cheers, Stephen Rothwell pgp3qvYxBDGsl.pgp Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (arm multi_v7_defconfig) failed like this: drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save' 111 | static depot_stack_handle_t __stack_depot_save(void) | ^~ In file included from include/linux/page_ext.h:7, from include/linux/mm.h:25, from include/linux/kallsyms.h:13, from include/linux/bpf.h:20, from include/linux/bpf-cgroup.h:5, from include/linux/cgroup-defs.h:22, from include/linux/cgroup.h:28, from include/linux/memcontrol.h:13, from include/linux/swap.h:9, from include/linux/suspend.h:5, from include/linux/regulator/consumer.h:35, from include/linux/i2c.h:18, from include/drm/drm_crtc.h:28, from include/drm/drm_atomic.h:31, from drivers/gpu/drm/drm_modeset_lock.c:24: include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries, | ^~ Caused by commit cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff") This may only have been revealed because of another fix I have had to apply today. I have applied the following patch for today. From: Stephen Rothwell Date: Fri, 15 Oct 2021 20:17:52 +1100 Subject: [PATCH] drm/locking: fix for name conflict Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff") Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/drm_modeset_lock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c index 4d32b61fa1fd..ee36dd20900d 100644 --- a/drivers/gpu/drm/drm_modeset_lock.c +++ b/drivers/gpu/drm/drm_modeset_lock.c @@ -79,7 +79,7 @@ static DEFINE_WW_CLASS(crtc_ww_class); #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK) -static noinline depot_stack_handle_t __stack_depot_save(void) +static noinline depot_stack_handle_t __drm_stack_depot_save(void) { unsigned long entries[8]; unsigned int n; @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot) kfree(buf); } #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */ -static depot_stack_handle_t __stack_depot_save(void) +static depot_stack_handle_t __drm_stack_depot_save(void) { return 0; } @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock, ret = 0; } else if (ret == -EDEADLK) { ctx->contended = lock; - ctx->stack_depot = __stack_depot_save(); + ctx->stack_depot = __drm_stack_depot_save(); } return ret; -- 2.33.0 -- Cheers, Stephen Rothwell pgpOxMX6q2a_n.pgp Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/xlnx/zynqmp_disp.c: In function 'zynqmp_disp_create_planes': drivers/gpu/drm/xlnx/zynqmp_disp.c:1260:17: error: implicit declaration of function 'drm_plane_create_zpos_immutable_property'; did you mean 'drm_plane_create_scaling_filter_property'? [-Werror=implicit-function-declaration] 1260 | drm_plane_create_zpos_immutable_property(&layer->plane, i); | ^~~~ | drm_plane_create_scaling_filter_property drivers/gpu/drm/xlnx/zynqmp_disp.c:1262:25: error: implicit declaration of function 'drm_plane_create_alpha_property'; did you mean 'drm_plane_create_color_properties'? [-Werror=implicit-function-declaration] 1262 | drm_plane_create_alpha_property(&layer->plane); | ^~~ | drm_plane_create_color_properties cc1: all warnings being treated as errors Presumably caused by one of the commits that dropped includes from drm-ctrc.h. I have used the drm-misc tree from next-20220620 for today. -- Cheers, Stephen Rothwell pgpONB8A38WPS.pgp Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/panel/panel-newvision-nv3052c.c:478:19: error: initialization of 'void (*)(struct spi_device *)' from incompatible pointer type 'int (*)(struct spi_device *)' [-Werror=incompatible-pointer-types] 478 | .remove = nv3052c_remove, | ^~ drivers/gpu/drm/panel/panel-newvision-nv3052c.c:478:19: note: (near initialization for 'nv3052c_driver.remove') Caused by commit 49956b505c53 ("drm/panel: Add panel driver for NewVision NV3052C based LCDs") interacting with commit 2cbfa2128662 ("spi: make remove callback a void function") from Linus' tree (merged in v5.18-rc1). I applied the following merge resolution patch for today. From: Stephen Rothwell Date: Wed, 6 Apr 2022 10:46:57 +1000 Subject: [PATCH] fixup for "spi: make remove callback a void function" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/panel/panel-newvision-nv3052c.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-newvision-nv3052c.c b/drivers/gpu/drm/panel/panel-newvision-nv3052c.c index 127bcfdb59df..cf078f0d3cd3 100644 --- a/drivers/gpu/drm/panel/panel-newvision-nv3052c.c +++ b/drivers/gpu/drm/panel/panel-newvision-nv3052c.c @@ -416,15 +416,13 @@ static int nv3052c_probe(struct spi_device *spi) return 0; } -static int nv3052c_remove(struct spi_device *spi) +static void nv3052c_remove(struct spi_device *spi) { struct nv3052c *priv = spi_get_drvdata(spi); drm_panel_remove(&priv->panel); drm_panel_disable(&priv->panel); drm_panel_unprepare(&priv->panel); - - return 0; } static const struct drm_display_mode ltk035c5444t_modes[] = { -- 2.35.1 -- Cheers, Stephen Rothwell pgppVOVeCHoZt.pgp Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (powerpc allyesconfig) failed like this: drivers/firmware/efi/sysfb_efi.c:29:10: fatal error: asm/efi.h: No such file or directory 29 | #include | ^~~ Caused by commit fa0e256450f2 ("fbdev: vesafb: Allow to be built if COMPILE_TEST is enabled") $ find arch -name efi.h arch/arm/include/asm/efi.h arch/arm64/include/asm/efi.h arch/ia64/include/asm/efi.h arch/loongarch/include/asm/efi.h arch/riscv/include/asm/efi.h arch/x86/boot/compressed/efi.h arch/x86/include/asm/efi.h I have reverted that commit for today. -- Cheers, Stephen Rothwell pgp78zogS7qSZ.pgp Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/nouveau/nouveau_dmem.c: In function 'nouveau_dmem_migrate_chunk': drivers/gpu/drm/nouveau/nouveau_dmem.c:681:43: error: 'chunk' undeclared (first use in this function) 681 | nouveau_fence_emit(fence, chunk->drm->dmem->migrate.chan); | ^ Caused by commit 7f2a0b50b2b2 ("drm/nouveau: fence: separate fence alloc and emit") I have used the drm-misc tree from next-20230804 for today. -- Cheers, Stephen Rothwell pgpEToMq80uLP.pgp Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (arm multi_v7_defconfig) failed like this: drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_do_release': drivers/gpu/drm/lima/lima_ctx.c:53:45: error: 'struct drm_sched_entity' has no member named 'elapsed_ns' 53 | mgr->elapsed_ns[i] += entity->elapsed_ns; | ^~ drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_mgr_usage': drivers/gpu/drm/lima/lima_ctx.c:125:43: error: 'struct drm_sched_entity' has no member named 'elapsed_ns' 125 | usage[i] += entity->elapsed_ns; | ^~ Caused by commit bccafec957a5 ("drm/lima: add usage counting method to ctx_mgr") interacting with commit baad10973fdb ("Revert "drm/scheduler: track GPU active time per entity"") from Linus' tree. I can't see any obvious way to fix this up, so I have used teh drm-misc tree from next-20230331 for today. -- Cheers, Stephen Rothwell pgpCN28W1yefr.pgp Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/usb/typec/altmodes/displayport.c: In function 'dp_altmode_vdm': drivers/usb/typec/altmodes/displayport.c:309:33: error: too few arguments to function 'drm_connector_oob_hotplug_event' 309 | drm_connector_oob_hotplug_event(dp->connector_fwnode); | ^~~ In file included from drivers/usb/typec/altmodes/displayport.c:17: include/drm/drm_connector.h:1984:6: note: declared here 1984 | void drm_connector_oob_hotplug_event(struct fwnode_handle *connector_fwnode, | ^~~ Caused by commit fc93835bb0d7 ("drm: Add HPD state to drm_connector_oob_hotplug_event()") interacting with commit 89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when exiting mode") from the usb.current tree. I have applied the following merge fix patch. From: Stephen Rothwell Date: Thu, 12 Oct 2023 12:17:31 +1100 Subject: [PATCH] fix up for "drm: Add HPD state to drm_connector_oob_hotplug_event()" interacting with commit 89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when exiting mode") Signed-off-by: Stephen Rothwell --- drivers/usb/typec/altmodes/displayport.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c index ddfb5b6ace4f..eb0bf08fc97a 100644 --- a/drivers/usb/typec/altmodes/displayport.c +++ b/drivers/usb/typec/altmodes/displayport.c @@ -306,7 +306,8 @@ static int dp_altmode_vdm(struct typec_altmode *alt, dp->data.status = 0; dp->data.conf = 0; if (dp->hpd) { - drm_connector_oob_hotplug_event(dp->connector_fwnode); + drm_connector_oob_hotplug_event(dp->connector_fwnode + connector_status_disconnected); dp->hpd = false; sysfs_notify(&dp->alt->dev.kobj, "displayport", "hpd"); } -- 2.40.1 -- Cheers, Stephen Rothwell pgpetFx2r98Vf.pgp Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/nouveau/nouveau_sched.c:21:41: error: 'DRM_SCHED_PRIORITY_MIN' undeclared here (not in a function); did you mean 'DRM_SCHED_PRIORITY_LOW'? 21 | NOUVEAU_SCHED_PRIORITY_SINGLE = DRM_SCHED_PRIORITY_MIN, | ^~ | DRM_SCHED_PRIORITY_LOW Caused by commit fe375c74806d ("drm/sched: Rename priority MIN to LOW") I have used the drm-misc tree from next-20231124 for today. -- Cheers, Stephen Rothwell pgptYMmYNM7d1.pgp Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/v3d/v3d_sched.c:263:1: error: return type is an incomplete type 263 | v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job) | ^ drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_gpu_reset_for_timeout': drivers/gpu/drm/v3d/v3d_sched.c:289:9: error: 'return' with a value, in function returning void [-Werror=return-type] 289 | return DRM_GPU_SCHED_STAT_NOMINAL; | ^~ drivers/gpu/drm/v3d/v3d_sched.c:263:1: note: declared here 263 | v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job) | ^ drivers/gpu/drm/v3d/v3d_sched.c: At top level: drivers/gpu/drm/v3d/v3d_sched.c:298:1: error: return type is an incomplete type 298 | v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q, | ^~~ drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_cl_job_timedout': drivers/gpu/drm/v3d/v3d_sched.c:309:10: error: 'return' with a value, in function returning void [-Werror=return-type] 309 | return DRM_GPU_SCHED_STAT_NOMINAL; | ^~ drivers/gpu/drm/v3d/v3d_sched.c:298:1: note: declared here 298 | v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q, | ^~~ drivers/gpu/drm/v3d/v3d_sched.c: At top level: drivers/gpu/drm/v3d/v3d_sched.c:316:1: error: return type is an incomplete type 316 | v3d_bin_job_timedout(struct drm_sched_job *sched_job) | ^~~~ drivers/gpu/drm/v3d/v3d_sched.c:325:1: error: return type is an incomplete type 325 | v3d_render_job_timedout(struct drm_sched_job *sched_job) | ^~~ drivers/gpu/drm/v3d/v3d_sched.c:334:1: error: return type is an incomplete type 334 | v3d_generic_job_timedout(struct drm_sched_job *sched_job) | ^~~~ drivers/gpu/drm/v3d/v3d_sched.c:342:1: error: return type is an incomplete type 342 | v3d_csd_job_timedout(struct drm_sched_job *sched_job) | ^~~~ drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_csd_job_timedout': drivers/gpu/drm/v3d/v3d_sched.c:353:10: error: 'return' with a value, in function returning void [-Werror=return-type] 353 | return DRM_GPU_SCHED_STAT_NOMINAL; | ^~ drivers/gpu/drm/v3d/v3d_sched.c:342:1: note: declared here 342 | v3d_csd_job_timedout(struct drm_sched_job *sched_job) | ^~~~ drivers/gpu/drm/v3d/v3d_sched.c: At top level: drivers/gpu/drm/v3d/v3d_sched.c:362:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types] 362 | .timedout_job = v3d_bin_job_timedout, | ^~~~ drivers/gpu/drm/v3d/v3d_sched.c:362:18: note: (near initialization for 'v3d_bin_sched_ops.timedout_job') drivers/gpu/drm/v3d/v3d_sched.c:369:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types] 369 | .timedout_job = v3d_render_job_timedout, | ^~~ drivers/gpu/drm/v3d/v3d_sched.c:369:18: note: (near initialization for 'v3d_render_sched_ops.timedout_job') drivers/gpu/drm/v3d/v3d_sched.c:376:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types] 376 | .timedout_job = v3d_generic_job_timedout, | ^~~~ drivers/gpu/drm/v3d/v3d_sched.c:376:18: note: (near initialization for 'v3d_tfu_sched_ops.timedout_job') drivers/gpu/drm/v3d/v3d_sched.c:383:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types] 383 | .timedout_job = v3d_csd_job_timedout, | ^~~~ drivers/gpu/drm/v3d/v3d_sched.c:383:18: note: (near initialization for 'v3d_csd_sched_ops.timedout_job') drivers/gpu/drm/v3d/v3d_sched.c:390:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types] 390 | .timedout_job = v3d_generic_job_timedout, | ^~~~ drivers/gpu/drm/v3d/v3d_sched.c:390:18: note: (near initialization for 'v3d_cache_clean_sched_ops.timedout_job') Caused by commit a6a1f036c74e ("drm/scheduler: Job timeout handler returns status (v3)") I have used the drm-misc tree from next-20210129 for today. -- Cheers, Stephen Rothwe
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: Caused by commit 10d8f308ba3e ("cec: add cec_adapter to cec_notifier_cec_adap_unregister()") interacting with commit 7e86efa2ff03 ("media: cec-gpio: add notifier support") form the v4l-dvb tree. I have applied the following merge fix patch. From: Stephen Rothwell Date: Tue, 8 Oct 2019 10:26:05 +1100 Subject: [PATCH] cec: fix up for "cec: add cec_adapter to cec_notifier_cec_adap_unregister()" Signed-off-by: Stephen Rothwell --- drivers/media/platform/cec-gpio/cec-gpio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/cec-gpio/cec-gpio.c b/drivers/media/platform/cec-gpio/cec-gpio.c index 7be91e712c4a..42d2c2cd9a78 100644 --- a/drivers/media/platform/cec-gpio/cec-gpio.c +++ b/drivers/media/platform/cec-gpio/cec-gpio.c @@ -259,7 +259,7 @@ static int cec_gpio_probe(struct platform_device *pdev) return 0; unreg_notifier: - cec_notifier_cec_adap_unregister(cec->notifier); + cec_notifier_cec_adap_unregister(cec->notifier, cec->adap); del_adap: cec_delete_adapter(cec->adap); return ret; @@ -269,7 +269,7 @@ static int cec_gpio_remove(struct platform_device *pdev) { struct cec_gpio *cec = platform_get_drvdata(pdev); - cec_notifier_cec_adap_unregister(cec->notifier); + cec_notifier_cec_adap_unregister(cec->notifier, cec->adap); cec_unregister_adapter(cec->adap); return 0; } -- 2.23.0.rc1 -- Cheers, Stephen Rothwell pgpK5fn7J9sbB.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_module.c:25: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory 40 | #include | ^~~~ In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_chardev.c:38: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory 40 | #include | ^~~~ In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device.c:26: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory 40 | #include | ^~~~ In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:34: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory 40 | #include | ^~~~ Caused by commit 4e98f871bcff ("drm: delete drmP.h + drm_os_linux.h") interacting with commit 6b855f7b83d2 ("drm/amdkfd: Check against device cgroup") from the amdgpu tree. I added the following merge fix patch for today: From: Stephen Rothwell Date: Wed, 9 Oct 2019 11:24:38 +1100 Subject: [PATCH] drm/amdkfd: update for drmP.h removal Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h index b8b4485c8f74..41bc0428bfc0 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h @@ -37,7 +37,9 @@ #include #include #include -#include +#include +#include +#include #include #include "amd_shared.h" @@ -49,8 +51,6 @@ /* GPU ID hash width in bits */ #define KFD_GPU_ID_HASH_WIDTH 16 -struct drm_device; - /* Use upper bits of mmap offset to store KFD driver specific information. * BITS[63:62] - Encode MMAP type * BITS[61:46] - Encode gpu_id. To identify to which GPU the offset belongs to -- 2.23.0 -- Cheers, Stephen Rothwell pgpZdzpthon0_.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c:23:10: fatal error: drm/drmP.h: No such file or directory 23 | #include | ^~~~ Caused by commit 4e98f871bcff ("drm: delete drmP.h + drm_os_linux.h") interacting with commit 8b8c294c5d37 ("drm/amdgpu: add function to check tmz capability (v4)") from the amdgpu tree. I applied the following merge fix patch for today (which should also apply to the amdgpu tree). From: Stephen Rothwell Date: Wed, 16 Oct 2019 11:17:32 +1100 Subject: [PATCH] drm/amdgpu: fix up for amdgpu_tmz.c and removal of drm/drmP.h Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c index 14a55003dd81..823527a0fa47 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c @@ -20,7 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include +#include + +#include + #include "amdgpu.h" #include "amdgpu_tmz.h" -- 2.23.0 -- Cheers, Stephen Rothwell pgpILj2DiYPCk.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (powerpc allyesconfig) failed like this: drivers/gpu/drm/virtio/virtgpu_object.c:31:67: error: expected ')' before 'int' module_param_named(virglhack, virtio_gpu_virglrenderer_workaround, int, 0400); ^~~~ ) Caused by commit 3e93bc2a58aa ("drm/virtio: make resource id workaround runtime switchable.") I applied the following fix patch: From: Stephen Rothwell Date: Wed, 28 Aug 2019 18:37:40 +1000 Subject: [PATCH] drm/virtio: module_param_named() requires linux/moduleparam.h Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/virtio/virtgpu_object.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c index aab5534056ec..b5f8923ac674 100644 --- a/drivers/gpu/drm/virtio/virtgpu_object.c +++ b/drivers/gpu/drm/virtio/virtgpu_object.c @@ -23,6 +23,8 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include + #include #include "virtgpu_drv.h" -- 2.20.1 -- Cheers, Stephen Rothwell pgpSm9ukMZyh2.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/v3d/v3d_sched.c:263:1: error: return type is an incomplete type 263 | v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job) | ^ drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_gpu_reset_for_timeout': drivers/gpu/drm/v3d/v3d_sched.c:289:9: error: 'return' with a value, in function returning void [-Werror=return-type] 289 | return DRM_GPU_SCHED_STAT_NOMINAL; | ^~ drivers/gpu/drm/v3d/v3d_sched.c:263:1: note: declared here 263 | v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job) | ^ drivers/gpu/drm/v3d/v3d_sched.c: At top level: drivers/gpu/drm/v3d/v3d_sched.c:298:1: error: return type is an incomplete type 298 | v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q, | ^~~ drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_cl_job_timedout': drivers/gpu/drm/v3d/v3d_sched.c:309:10: error: 'return' with a value, in function returning void [-Werror=return-type] 309 | return DRM_GPU_SCHED_STAT_NOMINAL; | ^~ drivers/gpu/drm/v3d/v3d_sched.c:298:1: note: declared here 298 | v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q, | ^~~ drivers/gpu/drm/v3d/v3d_sched.c: At top level: drivers/gpu/drm/v3d/v3d_sched.c:316:1: error: return type is an incomplete type 316 | v3d_bin_job_timedout(struct drm_sched_job *sched_job) | ^~~~ drivers/gpu/drm/v3d/v3d_sched.c:325:1: error: return type is an incomplete type 325 | v3d_render_job_timedout(struct drm_sched_job *sched_job) | ^~~ drivers/gpu/drm/v3d/v3d_sched.c:334:1: error: return type is an incomplete type 334 | v3d_generic_job_timedout(struct drm_sched_job *sched_job) | ^~~~ drivers/gpu/drm/v3d/v3d_sched.c:342:1: error: return type is an incomplete type 342 | v3d_csd_job_timedout(struct drm_sched_job *sched_job) | ^~~~ drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_csd_job_timedout': drivers/gpu/drm/v3d/v3d_sched.c:353:10: error: 'return' with a value, in function returning void [-Werror=return-type] 353 | return DRM_GPU_SCHED_STAT_NOMINAL; | ^~ drivers/gpu/drm/v3d/v3d_sched.c:342:1: note: declared here 342 | v3d_csd_job_timedout(struct drm_sched_job *sched_job) | ^~~~ drivers/gpu/drm/v3d/v3d_sched.c: At top level: drivers/gpu/drm/v3d/v3d_sched.c:362:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types] 362 | .timedout_job = v3d_bin_job_timedout, | ^~~~ drivers/gpu/drm/v3d/v3d_sched.c:362:18: note: (near initialization for 'v3d_bin_sched_ops.timedout_job') drivers/gpu/drm/v3d/v3d_sched.c:369:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types] 369 | .timedout_job = v3d_render_job_timedout, | ^~~ drivers/gpu/drm/v3d/v3d_sched.c:369:18: note: (near initialization for 'v3d_render_sched_ops.timedout_job') drivers/gpu/drm/v3d/v3d_sched.c:376:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types] 376 | .timedout_job = v3d_generic_job_timedout, | ^~~~ drivers/gpu/drm/v3d/v3d_sched.c:376:18: note: (near initialization for 'v3d_tfu_sched_ops.timedout_job') drivers/gpu/drm/v3d/v3d_sched.c:383:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types] 383 | .timedout_job = v3d_csd_job_timedout, | ^~~~ drivers/gpu/drm/v3d/v3d_sched.c:383:18: note: (near initialization for 'v3d_csd_sched_ops.timedout_job') drivers/gpu/drm/v3d/v3d_sched.c:390:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types] 390 | .timedout_job = v3d_generic_job_timedout, | ^~~~ drivers/gpu/drm/v3d/v3d_sched.c:390:18: note: (near initialization for 'v3d_cache_clean_sched_ops.timedout_job') Caused by commit c10983e14e8f ("drm/scheduler: Job timeout handler returns status (v3)") I have used the drm-misc tree from next-20210209 for today. -- Cheers, Stephen Rothwe
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (arm multi_v7_defconfig) failed like this: drivers/gpu/drm/msm/msm_gem.c:1014:10: error: initialization of 'int (*)(struct drm_gem_object *, struct dma_buf_map *)' from incompatible pointer type 'void * (*)(struct drm_gem_object *)' [-Werror=incompatible-pointer-types] 1014 | .vmap = msm_gem_prime_vmap, | ^~ drivers/gpu/drm/msm/msm_gem.c:1014:10: note: (near initialization for 'msm_gem_object_funcs.vmap') drivers/gpu/drm/msm/msm_gem.c:1015:12: error: initialization of 'void (*)(struct drm_gem_object *, struct dma_buf_map *)' from incompatible pointer type 'void (*)(struct drm_gem_object *, void *)' [-Werror=incompatible-pointer-types] 1015 | .vunmap = msm_gem_prime_vunmap, |^~~~ Caused by commit 49a3f51dfeee ("drm/gem: Use struct dma_buf_map in GEM vmap ops and convert GEM backends") interacting with commit 3c9edd9c85f5 ("drm/msm: Introduce GEM object funcs") from the drm tree. I tried reverting commit 3c9edd9c85f5 (as 49a3f51dfeee does not revert cleanly) but that just produced more errors, so I have disabled CONFIG_DRM_MSM for now. -- Cheers, Stephen Rothwell pgpKF9QObojh9.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: I noticed that the ingenic driver revert I had been waiting for appeared in hte drm-misc tree, so I removed the BROKEN dependency for it, but it produced the above errors, so I have marked it BROKEN again. -- Cheers, Stephen Rothwell pgpzU0SuNYvli.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/nouveau/nouveau_ttm.c: In function 'nouveau_ttm_init': drivers/gpu/drm/nouveau/nouveau_ttm.c:320:19: error: implicit declaration of function 'swiotlb_nr_tbl' [-Werror=implicit-function-declaration] 320 | need_swiotlb = !!swiotlb_nr_tbl(); | ^~ Caused by commit ee5d2a8e549e ("drm/ttm: wire up the new pool as default one v2") I have used the drm-misc tree from next-20201029 for today. -- Cheers, Stephen Rothwell pgphBefRSHmHF.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (arm multi_v7_defconfig) failed like this: In file included from drivers/gpu/drm/nouveau/nouveau_ttm.c:26: include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size': include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in this function) 99 | return SIZE_MAX; | ^~~~ include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header ''; did you forget to '#include '? 6 | #include +++ |+#include 7 | #include include/linux/swiotlb.h:99:9: note: each undeclared identifier is reported only once for each function it appears in 99 | return SIZE_MAX; | ^~~~ Caused by commit abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()") but only exposed by commit 4dbafbd30aef ("drm/nouveu: fix swiotlb include") I applied the following fix for today: From: Stephen Rothwell Date: Mon, 2 Nov 2020 12:34:57 +1100 Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()") Signed-off-by: Stephen Rothwell --- include/linux/swiotlb.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h index 513913ff7486..ed9de7855d3b 100644 --- a/include/linux/swiotlb.h +++ b/include/linux/swiotlb.h @@ -5,6 +5,9 @@ #include #include #include +#ifndef CONFIG_SWIOTLB +#include +#endif struct device; struct page; -- 2.28.0 -- Cheers, Stephen Rothwell pgpHheJznw0cF.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/amd/amdgpu/amdgpu_object.c: In function 'amdgpu_bo_release_notify': drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:1245:28: error: 'struct ttm_buffer_object' has no member named 'resv' reservation_object_lock(bo->resv, NULL); ^~ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:1247:47: error: 'struct ttm_buffer_object' has no member named 'resv' r = amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->resv, &fence); ^~ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:1253:30: error: 'struct ttm_buffer_object' has no member named 'resv' reservation_object_unlock(bo->resv); ^~ Caused by commit 5a5011a72489 ("drm/amdgpu: switch driver from bo->resv to bo->base.resv") interacting with commit ab2f7a5c18b5 ("drm/amdgpu: Implement VRAM wipe on release") from the amdgpu tree. I have added the following patch for today: From: Stephen Rothwell Date: Wed, 7 Aug 2019 13:17:54 +1000 Subject: [PATCH] drm/amdgpu: fix up for "drm/amdgpu: switch driver from bo->resv to bo->base.resv" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index b2c03be51c29..2d07f16f1789 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -1242,15 +1242,15 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo) !(abo->flags & AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE)) return; - reservation_object_lock(bo->resv, NULL); + reservation_object_lock(bo->base.resv, NULL); - r = amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->resv, &fence); + r = amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->base.resv, &fence); if (!WARN_ON(r)) { amdgpu_bo_fence(abo, fence, false); dma_fence_put(fence); } - reservation_object_unlock(bo->resv); + reservation_object_unlock(bo->base.resv); } /** -- 2.20.1 -- Cheers, Stephen Rothwell pgpqn9As2DQLD.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (powerpc allyesconfig) failed like this: drivers/gpu/drm/nouveau/nouveau_connector.c: In function 'nouveau_connector_of_detect': drivers/gpu/drm/nouveau/nouveau_connector.c:463:59: error: 'struct drm_device' has no member named 'pdev'; did you mean 'dev'? 463 | struct device_node *cn, *dn = pci_device_to_OF_node(dev->pdev); | ^~~~ | dev Caused by commit b347e04452ff ("drm: Remove pdev field from struct drm_device") I have reverted that commit for today. -- Cheers, Stephen Rothwell pgpXJh22Xbh4M.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (arm multi_v7_defconfig) failed like this: drivers/gpu/drm/drm_cache.c: In function 'drm_need_swiotlb': drivers/gpu/drm/drm_cache.c:202:6: error: implicit declaration of function 'mem_encrypt_active' [-Werror=implicit-function-declaration] 202 | if (mem_encrypt_active()) | ^~ Caused by commit 3abc66706385 ("drm: Implement drm_need_swiotlb() in drm_cache.c") I have used the drm-misc tree from next-20210107 again for today. -- Cheers, Stephen Rothwell pgphiXabzo_aR.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: drivers/infiniband/core/umem_dmabuf.c: In function 'ib_umem_dmabuf_map_pages': drivers/infiniband/core/umem_dmabuf.c:69:10: error: implicit declaration of function 'dma_resv_get_excl'; did you mean 'dma_resv_get_fences'? [-Werror=implicit-function-declaration] 69 | fence = dma_resv_get_excl(umem_dmabuf->attach->dmabuf->resv); | ^ | dma_resv_get_fences drivers/infiniband/core/umem_dmabuf.c:69:8: warning: assignment to 'struct dma_fence *' from 'int' makes pointer from integer without a cast [-Wint-conversion] 69 | fence = dma_resv_get_excl(umem_dmabuf->attach->dmabuf->resv); |^ Caused by commit 6edbd6abb783 ("dma-buf: rename and cleanup dma_resv_get_excl v3") I have used the drm-misc tree from next-20210604 for today. -- Cheers, Stephen Rothwell pgpHTxpsI2967.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from drivers/gpu/drm/arm/display/komeda/komeda_drv.c:13: drivers/gpu/drm/arm/display/komeda/komeda_kms.h:87:20: error: field 'base' has incomplete type struct drm_device base; ^~~~ drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_parse_pipe_dt': drivers/gpu/drm/arm/display/komeda/komeda_dev.c:27:3: error: implicit declaration of function 'DRM_ERROR'; did you mean 'DRM_IOR'? [-Werror=implicit-function-declaration] DRM_ERROR("get aclk for pipeline %d failed!\n", pipe_id); ^ DRM_IOR drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_dev_create': drivers/gpu/drm/arm/display/komeda/komeda_dev.c:127:2: error: implicit declaration of function 'DRM_INFO'; did you mean 'DRM_IO'? [-Werror=implicit-function-declaration] DRM_INFO("Found ARM Mali-D%x version r%dp%d\n", ^~~~ DRM_IO drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_dev_destroy': drivers/gpu/drm/arm/display/komeda/komeda_dev.c:170:3: error: implicit declaration of function 'devm_iounmap'; did you mean 'pci_iounmap'? [-Werror=implicit-function-declaration] devm_iounmap(dev, mdev->reg_base); ^~~~ pci_iounmap and lots more ... Probably caused by commit e3b01f0d576a ("drm: remove drmP.h from drm_modeset_helper.h") I have used the drm-misc tree from next-20190207 for today. -- Cheers, Stephen Rothwell pgpcycNlzV0FC.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: In function 'amdgpu_preempt_mgr_new': drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:75:5: error: 'struct ttm_resource' has no member named 'mm_node' 75 | mem->mm_node = NULL; | ^~ drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: At top level: drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: error: initialization of 'int (*)(struct ttm_resource_manager *, struct ttm_buffer_object *, const struct ttm_place *, struct ttm_resource **)' from incompatible pointer type 'int (*)(struct ttm_resource_manager *, struct ttm_buffer_object *, const struct ttm_place *, struct ttm_resource *)' [-Werror=incompatible-pointer-types] 129 | .alloc = amdgpu_preempt_mgr_new, | ^~ drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: note: (near initialization for 'amdgpu_preempt_mgr_func.alloc') Caused by commit cb1c81467af3 ("drm/ttm: flip the switch for driver allocated resources v2") from the drm-misc tree interacting with commit b453e42a6e8b ("drm/amdgpu: Add new placement for preemptible SG BOs") from the drm tree. I don't know how to fix this, so I added the following hack (a better fix would be nice): From: Stephen Rothwell Date: Tue, 8 Jun 2021 12:41:16 +1000 Subject: [PATCH] hack fix up for needed amdgpu_preempt_mgr_new() fix up Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c index d607f314cc1b..e1a7b3e967b9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c @@ -66,14 +66,16 @@ static DEVICE_ATTR_RO(mem_info_preempt_used); static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man, struct ttm_buffer_object *tbo, const struct ttm_place *place, - struct ttm_resource *mem) + struct ttm_resource **res) { +#if 0 struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man); atomic64_add(mem->num_pages, &mgr->used); mem->mm_node = NULL; mem->start = AMDGPU_BO_INVALID_OFFSET; +#endif return 0; } -- 2.30.2 -- Cheers, Stephen Rothwell pgpS0X9ihg7Bl.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (powerpc allyesconfig) failed like this: drivers/video/fbdev/controlfb.c: In function 'controlfb_mmap': drivers/video/fbdev/controlfb.c:756:23: error: implicit declaration of function 'pgprot_cached_wthru'; did you mean 'pgprot_cached'? [-Werror=implicit-function-declaration] 756 | vma->vm_page_prot = pgprot_cached_wthru(vma->vm_page_prot); | ^~~ | pgprot_cached drivers/video/fbdev/controlfb.c:756:23: error: incompatible types when assigning to type 'pgprot_t' {aka 'struct '} from type 'int' Presumably exposed by commit a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support") I just turned off COMPILE_TEST again for today. Please let me know when this is fixed. -- Cheers, Stephen Rothwell pgpxu9O9u3X9c.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4031:18: error: initialization of 'int (*)(struct drm_connector *, struct drm_atomic_state *)' from incompatible pointer type 'int (*)(struct drm_connector *, struct drm_connector_state *)' [-Werror=incompatible-pointer-types] .atomic_check = amdgpu_dm_connector_atomic_check, ^~~~ drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4031:18: note: (near initialization for 'amdgpu_dm_connector_helper_funcs.atomic_check') Caused by commit 6f3b62781bbd ("drm: Convert connector_helper_funcs->atomic_check to accept drm_atomic_state") interacting with commit 88694af9e4d1 ("drm/amd/display: Expose HDR output metadata for supported connectors") from the drm tree. I added the following merge fix patch: From: Stephen Rothwell Date: Fri, 14 Jun 2019 14:27:12 +1000 Subject: [PATCH] fixup for "drm: Convert connector_helper_funcs->atomic_check to accept drm_atomic_state" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 413bf22e9585..b3a083c9a11c 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -3976,9 +3976,10 @@ is_hdr_metadata_different(const struct drm_connector_state *old_state, static int amdgpu_dm_connector_atomic_check(struct drm_connector *conn, -struct drm_connector_state *new_con_state) +struct drm_atomic_state *state) { - struct drm_atomic_state *state = new_con_state->state; + struct drm_connector_state *new_con_state = + drm_atomic_get_new_connector_state(state, conn); struct drm_connector_state *old_con_state = drm_atomic_get_old_connector_state(state, conn); struct drm_crtc *crtc = new_con_state->crtc; -- 2.20.1 -- Cheers, Stephen Rothwell pgp1Pt6SGZafk.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/radeon/radeon_connectors.c: In function 'radeon_add_legacy_connector': drivers/gpu/drm/radeon/radeon_connectors.c:2433:5: error: 'ddc' undeclared (first use in this function) ddc = &radeon_connector->ddc_bus->adapter; ^~~ drivers/gpu/drm/radeon/radeon_connectors.c:2433:5: note: each undeclared identifier is reported only once for each function it appears in Caused by commit bed7a2182de6 ("drm/radeon: Provide ddc symlink in connector sysfs directory") I have used the drm-misc tree from next-20190731 for today. -- Cheers, Stephen Rothwell pgpmYX829_tMF.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/bridge/analogix/analogix-anx6345.c: In function 'anx6345_i2c_probe': drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:738:30: error: implicit declaration of function 'i2c_new_dummy' [-Werror=implicit-function-declaration] 738 |anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter, | ^ drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:738:28: warning: assignment to 'struct i2c_client *' from 'int' makes pointer from integer without a cast [-Wint-conversion] 738 |anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter, |^ Caused by commit 6aa192698089 ("drm/bridge: Add Analogix anx6345 support") interacting with commit 2c2f00ab1641 ("i2c: remove i2c_new_dummy() API") From Linus' tree. I have applied the following fix up patch for today: From: Stephen Rothwell Date: Mon, 16 Dec 2019 12:11:19 +1100 Subject: [PATCH] drm/bridge: fix up for removal of i2c_new_dummy() Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c index 9917ce0d86a0..56f55c53abfd 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c @@ -735,13 +735,13 @@ static int anx6345_i2c_probe(struct i2c_client *client, /* Map slave addresses of ANX6345 */ for (i = 0; i < I2C_NUM_ADDRESSES; i++) { if (anx6345_i2c_addresses[i] >> 1 != client->addr) - anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter, + anx6345->i2c_clients[i] = i2c_new_dummy_device(client->adapter, anx6345_i2c_addresses[i] >> 1); else anx6345->i2c_clients[i] = client; - if (!anx6345->i2c_clients[i]) { - err = -ENOMEM; + if (IS_ERR(anx6345->i2c_clients[i])) { + err = PTR_ERR(anx6345->i2c_clients[i]); DRM_ERROR("Failed to reserve I2C bus %02x\n", anx6345_i2c_addresses[i]); goto err_unregister_i2c; -- 2.24.0 -- Cheers, Stephen Rothwell pgpJ9mcEK0qc9.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from include/linux/kernel.h:7, from include/asm-generic/bug.h:18, from arch/x86/include/asm/bug.h:83, from include/linux/bug.h:5, from include/linux/mmdebug.h:5, from include/linux/gfp.h:5, from include/linux/slab.h:15, from drivers/gpu/drm/lima/lima_ctx.c:4: drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_create': include/linux/limits.h:13:18: warning: passing argument 3 of 'xa_alloc' makes pointer from integer without a cast [-Wint-conversion] #define UINT_MAX (~0U) ^ drivers/gpu/drm/lima/lima_ctx.c:26:36: note: in expansion of macro 'UINT_MAX' err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL); ^~~~ In file included from include/linux/radix-tree.h:31, from include/linux/idr.h:15, from include/drm/drm_device.h:7, from drivers/gpu/drm/lima/lima_device.h:7, from drivers/gpu/drm/lima/lima_ctx.c:6: include/linux/xarray.h:817:9: note: expected 'void *' but argument is of type 'unsigned int' void *entry, struct xa_limit limit, gfp_t gfp) ~~^ drivers/gpu/drm/lima/lima_ctx.c:26:46: error: incompatible type for argument 4 of 'xa_alloc' err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL); ^~~ In file included from include/linux/radix-tree.h:31, from include/linux/idr.h:15, from include/drm/drm_device.h:7, from drivers/gpu/drm/lima/lima_device.h:7, from drivers/gpu/drm/lima/lima_ctx.c:6: include/linux/xarray.h:817:32: note: expected 'struct xa_limit' but argument is of type 'struct lima_ctx *' void *entry, struct xa_limit limit, gfp_t gfp) ^ Caused by commit a1d2a6339961 ("drm/lima: driver for ARM Mali4xx GPUs") interacting with commit a3e4d3f97ec8 ("XArray: Redesign xa_alloc API") from Linus' tree (v5.1-rc1). I have applied the following patch for today. It could be applied as part of a merge of v5.1-rc1 into drm-misc. From: Stephen Rothwell Date: Tue, 2 Apr 2019 10:45:32 +1100 Subject: [PATCH] drm/lima: update for xa_alloc API change Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/lima/lima_ctx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/lima/lima_ctx.c b/drivers/gpu/drm/lima/lima_ctx.c index c8d12f7c6894..bafa00d74cc5 100644 --- a/drivers/gpu/drm/lima/lima_ctx.c +++ b/drivers/gpu/drm/lima/lima_ctx.c @@ -23,7 +23,7 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id) goto err_out0; } - err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL); + err = xa_alloc(&mgr->handles, id, ctx, XA_LIMIT(*id, UINT_MAX), GFP_KERNEL); if (err < 0) goto err_out0; -- 2.20.1 -- Cheers, Stephen Rothwell pgps2klZ4Q8fD.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (powerpc allyesconfig) failed like this: kernel/dma/contiguous.c:19:10: fatal error: asm/dma-contiguous.h: No such file or directory #include ^~ Caused by commit 4f2a8f5898ec ("drm: Add ASPEED GFX driver") I have disabled that driver for today (by making it depend on BROKEN). -- Cheers, Stephen Rothwell pgpnTv6L4d7ao.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (powerpc allyesconfig) failed like this: drivers/gpu/drm/cirrus/cirrus.c: In function 'cirrus_fb_blit_rect': drivers/gpu/drm/cirrus/cirrus.c:310:25: error: implicit declaration of function '__io_virt'; did you mean '__do_irq'? [-Werror=implicit-function-declaration] drm_fb_memcpy_dstclip(__io_virt(cirrus->vram), ^ __do_irq drivers/gpu/drm/cirrus/cirrus.c:310:25: warning: passing argument 1 of 'drm_fb_memcpy_dstclip' makes pointer from integer without a cast [-Wint-conversion] drm_fb_memcpy_dstclip(__io_virt(cirrus->vram), ^~~ In file included from drivers/gpu/drm/cirrus/cirrus.c:33: include/drm/drm_format_helper.h:18:34: note: expected 'void *' but argument is of type 'int' void drm_fb_memcpy_dstclip(void *dst, void *vaddr, struct drm_framebuffer *fb, ~~^~~ drivers/gpu/drm/cirrus/cirrus.c:314:37: warning: passing argument 1 of 'drm_fb_xrgb_to_rgb565_dstclip' makes pointer from integer without a cast [-Wint-conversion] drm_fb_xrgb_to_rgb565_dstclip(__io_virt(cirrus->vram), ^~~ In file included from drivers/gpu/drm/cirrus/cirrus.c:33: include/drm/drm_format_helper.h:25:46: note: expected 'void *' but argument is of type 'int' void drm_fb_xrgb_to_rgb565_dstclip(void *dst, unsigned int dst_pitch, ~~^~~ drivers/gpu/drm/cirrus/cirrus.c:319:37: warning: passing argument 1 of 'drm_fb_xrgb_to_rgb888_dstclip' makes pointer from integer without a cast [-Wint-conversion] drm_fb_xrgb_to_rgb888_dstclip(__io_virt(cirrus->vram), ^~~ In file included from drivers/gpu/drm/cirrus/cirrus.c:33: include/drm/drm_format_helper.h:28:46: note: expected 'void *' but argument is of type 'int' void drm_fb_xrgb_to_rgb888_dstclip(void *dst, unsigned int dst_pitch, ~~^~~ Caused by commit ab3e023b1b4c ("drm/cirrus: rewrite and modernize driver.") I have marked that driver BROKEN for today. -- Cheers, Stephen Rothwell pgpI7Hiw1Nfda.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from include/drm/drm_gem.h:38, from include/drm/ttm/ttm_bo_api.h:34, from drivers/gpu/drm/i915/i915_deps.c:9: drivers/gpu/drm/i915/i915_deps.c: In function 'i915_deps_add_resv': drivers/gpu/drm/i915/i915_deps.c:229:46: error: implicit conversion from 'enum ' to 'enum dma_resv_usage' [-Werror=enum-conversion] 229 | dma_resv_for_each_fence(&iter, resv, true, fence) { | ^~~~ include/linux/dma-resv.h:297:47: note: in definition of macro 'dma_resv_for_each_fence' 297 | for (dma_resv_iter_begin(cursor, obj, usage), \ | ^ cc1: all warnings being treated as errors Caused by commit 7bc80a5462c3 ("dma-buf: add enum dma_resv_usage v4") I have used the drm-misc tree from next-20220407 for today. -- Cheers, Stephen Rothwell pgpFnCCmHSzOz.pgp Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: ERROR: modpost: missing MODULE_LICENSE() in drivers/gpu/drm/tests/drm_kunit_helpers.o Caused by commit 44a3928324e9 ("drm/tests: Add Kunit Helpers") I have used the drm-misc tree from next-20221115 for today. -- Cheers, Stephen Rothwell pgpysbHsfqCz6.pgp Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (powerpc ppc44x_defconfig) failed like this: ld: drivers/video/fbdev/core/fbmon.o: in function `fb_modesetting_disabled': fbmon.c:(.text+0x1e4): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here ld: drivers/video/fbdev/core/fbcmap.o: in function `fb_modesetting_disabled': fbcmap.c:(.text+0x478): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here ld: drivers/video/fbdev/core/fbsysfs.o: in function `fb_modesetting_disabled': fbsysfs.c:(.text+0xb64): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here ld: drivers/video/fbdev/core/modedb.o: in function `fb_modesetting_disabled': modedb.c:(.text+0x129c): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here ld: drivers/video/fbdev/core/fbcvt.o: in function `fb_modesetting_disabled': fbcvt.c:(.text+0x0): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here Caused by commit 0ba2fa8cbd29 ("fbdev: Add support for the nomodeset kernel parameter") This build does not have CONFIG_VIDEO_NOMODESET set. I applied the following patch for today. From 63f957a050c62478ed1348c5b204bc65c68df4d7 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Thu, 17 Nov 2022 18:19:22 +1100 Subject: [PATCH] fix up for "fbdev: Add support for the nomodeset kernel parameter" Signed-off-by: Stephen Rothwell --- include/linux/fb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/fb.h b/include/linux/fb.h index 3a822e4357b1..ea421724f733 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -807,7 +807,7 @@ extern int fb_find_mode(struct fb_var_screeninfo *var, #if defined(CONFIG_VIDEO_NOMODESET) bool fb_modesetting_disabled(const char *drvname); #else -bool fb_modesetting_disabled(const char *drvname) +static inline bool fb_modesetting_disabled(const char *drvname) { return false; } -- 2.35.1 -- Cheers, Stephen Rothwell pgpXVU0mipOSU.pgp Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/qxl/qxl_display.c: In function 'qxl_display_read_client_monitors_config': include/drm/drm_modeset_lock.h:167:7: error: implicit declaration of function 'drm_drv_uses_atomic_modeset' [-Werror=implicit-function-declaration] 167 | if (!drm_drv_uses_atomic_modeset(dev))\ | ^~~ drivers/gpu/drm/qxl/qxl_display.c:187:2: note: in expansion of macro 'DRM_MODESET_LOCK_ALL_BEGIN' 187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret); | ^~ drivers/gpu/drm/qxl/qxl_display.c:189:35: error: macro "DRM_MODESET_LOCK_ALL_END" requires 3 arguments, but only 2 given 189 | DRM_MODESET_LOCK_ALL_END(ctx, ret); | ^ In file included from include/drm/drm_crtc.h:36, from include/drm/drm_atomic.h:31, from drivers/gpu/drm/qxl/qxl_display.c:29: include/drm/drm_modeset_lock.h:194: note: macro "DRM_MODESET_LOCK_ALL_END" defined here 194 | #define DRM_MODESET_LOCK_ALL_END(dev, ctx, ret)\ | drivers/gpu/drm/qxl/qxl_display.c:189:2: error: 'DRM_MODESET_LOCK_ALL_END' undeclared (first use in this function) 189 | DRM_MODESET_LOCK_ALL_END(ctx, ret); | ^~~~ drivers/gpu/drm/qxl/qxl_display.c:189:2: note: each undeclared identifier is reported only once for each function it appears in drivers/gpu/drm/qxl/qxl_display.c:187:2: error: label 'modeset_lock_fail' used but not defined 187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret); | ^~ In file included from include/drm/drm_crtc.h:36, from include/drm/drm_atomic.h:31, from drivers/gpu/drm/qxl/qxl_display.c:29: include/drm/drm_modeset_lock.h:170:1: warning: label 'modeset_lock_retry' defined but not used [-Wunused-label] 170 | modeset_lock_retry: \ | ^~ drivers/gpu/drm/qxl/qxl_display.c:187:2: note: in expansion of macro 'DRM_MODESET_LOCK_ALL_BEGIN' 187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret); | ^~ drivers/gpu/drm/qxl/qxl_display.c: In function 'qxl_framebuffer_surface_dirty': drivers/gpu/drm/qxl/qxl_display.c:434:35: error: macro "DRM_MODESET_LOCK_ALL_END" requires 3 arguments, but only 2 given 434 | DRM_MODESET_LOCK_ALL_END(ctx, ret); | ^ In file included from include/drm/drm_crtc.h:36, from include/drm/drm_atomic.h:31, from drivers/gpu/drm/qxl/qxl_display.c:29: include/drm/drm_modeset_lock.h:194: note: macro "DRM_MODESET_LOCK_ALL_END" defined here 194 | #define DRM_MODESET_LOCK_ALL_END(dev, ctx, ret)\ | drivers/gpu/drm/qxl/qxl_display.c:434:2: error: 'DRM_MODESET_LOCK_ALL_END' undeclared (first use in this function) 434 | DRM_MODESET_LOCK_ALL_END(ctx, ret); | ^~~~ drivers/gpu/drm/qxl/qxl_display.c:411:2: error: label 'modeset_lock_fail' used but not defined 411 | DRM_MODESET_LOCK_ALL_BEGIN(fb->dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret); | ^~ In file included from include/drm/drm_crtc.h:36, from include/drm/drm_atomic.h:31, from drivers/gpu/drm/qxl/qxl_display.c:29: include/drm/drm_modeset_lock.h:170:1: warning: label 'modeset_lock_retry' defined but not used [-Wunused-label] 170 | modeset_lock_retry: \ | ^~ drivers/gpu/drm/qxl/qxl_display.c:411:2: note: in expansion of macro 'DRM_MODESET_LOCK_ALL_BEGIN' 411 | DRM_MODESET_LOCK_ALL_BEGIN(fb->dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret); | ^~ Caused by commit bbaac1354cc9 ("drm/qxl: Replace deprecated function in qxl_display") interacting with commit 77ef38574beb ("drm/modeset-lock: Take the modeset BKL for legacy drivers") from the drm-misc-fixes tree. drivers/gpu/drm/qxl/qxl_display.c manages to include drm/drm_modeset_lock.h by some indirect route, but fails to have drm/drm_drv.h similarly included. In fact, drm/drm_modeset_lock.h should have included drm/drm_drv.h since it uses things declared there, and drivers/gpu/drm/qxl/qxl_display.c should include drm/drm_modeset_lock.h similarly. I have added the following hack patch for today. From: Stephen Rothwell Date: Wed, 26 Aug 2020 10:40:18 +1000 Subject: [PATCH] fix interaction with drm-misc-fix commit Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/qxl/qxl_display.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c index fa79688013b7..6063f3a15329 100644 --- a/drivers/gpu/drm/qxl/qxl_display.c +++ b/drivers/gpu/drm/qxl/qxl_display.c @@ -26,6 +26,7 @@ #include #
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/nouveau/nouveau_display.c: In function 'nouveau_display_create': drivers/gpu/drm/nouveau/nouveau_display.c:662:29: error: unused variable 'device' [-Werror=unused-variable] 662 | struct nvkm_device *device = nvxx_device(&drm->client.device); | ^~ cc1: all warnings being treated as errors Introduced by commit 7c99616e3fe7 ("drm: Remove drm_mode_config::fb_base") I have used the drm-misc tree from next-20221020 for today. -- Cheers, Stephen Rothwell pgp2BrAsd5Mir.pgp Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (arm multi_v7_defconfig) failed like this: drivers/gpu/drm/nouveau/nouveau_drm.c: In function 'nouveau_drm_probe': drivers/gpu/drm/nouveau/nouveau_drm.c:797:17: error: implicit declaration of function 'drm_fbdev_generic_setup' [-Werror=implicit-function-declaration] 797 | drm_fbdev_generic_setup(drm_dev, 8); | ^~~ Caused by commit 8ab59da26bc0 ("drm/fb-helper: Move generic fbdev emulation into separate source file") interacting with commit 4a16dd9d18a0 ("drm/nouveau/kms: switch to drm fbdev helpers") from the drm tree. I have applied the following merge fix patch for today. From: Stephen Rothwell Date: Thu, 10 Nov 2022 11:05:52 +1100 Subject: [PATCH] drm-misc: fix up for "drm/fb-helper: Move generic fbdev emulation into separate source file" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/nouveau/nouveau_drm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index a19f18b251f3..80f154b6adab 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include -- 2.35.1 -- Cheers, Stephen Rothwell pgpToRxZptixi.pgp Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c: In function 'amdgpu_amdkfd_gpuvm_free_memory_of_gpu': drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c:1357:2: error: implicit declaration of function 'drm_gem_object_put_unlocked'; did you mean 'drm_gem_object_put_locked'? [-Werror=implicit-function-declaration] 1357 | drm_gem_object_put_unlocked(&mem->bo->tbo.base); | ^~~ | drm_gem_object_put_locked Caused by commit ab15d56e27be ("drm: remove transient drm_gem_object_put_unlocked()") interacting with commit fd9a9f8801de ("drm/amdgpu: Use GEM obj reference for KFD BOs") from Linus' tree. I have applied the following merge fix up patch for today. From: Stephen Rothwell Date: Wed, 17 Jun 2020 10:55:32 +1000 Subject: [PATCH] drm/amdgpu: remove stray drm_gem_object_put_unlocked Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c index b91b5171270f..9015c7b76d60 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c @@ -1354,7 +1354,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( } /* Free the BO*/ - drm_gem_object_put_unlocked(&mem->bo->tbo.base); + drm_gem_object_put(&mem->bo->tbo.base); mutex_destroy(&mem->lock); kfree(mem); -- 2.26.2 -- Cheers, Stephen Rothwell pgp3Ygr2S8ELT.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi Stephen, yeah, that is a known problem. I missed the change during rebase of the revert. Please see patch "2312f9842854 drm/v3d: fix broken build" which is already in drm-misc-next and fixes the issue. Christian. Am 06.12.18 um 03:32 schrieb Stephen Rothwell: > Hi all, > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/gpu/drm/v3d/v3d_gem.c: In function 'v3d_submit_tfu_ioctl': > drivers/gpu/drm/v3d/v3d_gem.c:719:3: error: too many arguments to function > 'drm_syncobj_replace_fence' > drm_syncobj_replace_fence(sync_out, 0, sched_done_fence); > ^ > In file included from drivers/gpu/drm/v3d/v3d_gem.c:5: > include/drm/drm_syncobj.h:134:6: note: declared here > void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, >^ > > Caused by commit > >0b258ed1a219 ("drm: revert "expand replace_fence to support timeline point > v2"") > > interacting with commit > >1584f16ca96e ("drm/v3d: Add support for submitting jobs to the TFU") > > I have used the drm-misc tree from next-20181205 for today. > ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Tue, Jan 08, 2019 at 11:12:41AM +1100, Stephen Rothwell wrote: > Hi all, > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function > 'amdgpu_dm_mode_config_init': > drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1695:30: error: > passing argument 1 of 'drm_atomic_private_obj_init' from incompatible pointer > type [-Werror=incompatible-pointer-types] > drm_atomic_private_obj_init(&adev->dm.atomic_obj, > ^~~~ > In file included from include/drm/drm_dp_mst_helper.h:27, > from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46, > from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57, > from > drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34: > include/drm/drm_atomic.h:437:53: note: expected 'struct drm_device *' but > argument is of type 'struct drm_private_obj *' > void drm_atomic_private_obj_init(struct drm_device *dev, > ~~~^~~ > drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1696:9: error: > passing argument 2 of 'drm_atomic_private_obj_init' from incompatible pointer > type [-Werror=incompatible-pointer-types] > &state->base, > ^~~~ > In file included from include/drm/drm_dp_mst_helper.h:27, > from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46, > from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57, > from > drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34: > include/drm/drm_atomic.h:438:30: note: expected 'struct drm_private_obj *' > but argument is of type 'struct drm_private_state *' > struct drm_private_obj *obj, > ^~~ > drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1697:9: error: > passing argument 3 of 'drm_atomic_private_obj_init' from incompatible pointer > type [-Werror=incompatible-pointer-types] > &dm_atomic_state_funcs); > ^~ > In file included from include/drm/drm_dp_mst_helper.h:27, > from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46, > from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57, > from > drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34: > include/drm/drm_atomic.h:439:32: note: expected 'struct drm_private_state *' > but argument is of type 'struct drm_private_state_funcs *' > struct drm_private_state *state, > ~~^ > drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1695:2: error: > too few arguments to function 'drm_atomic_private_obj_init' > drm_atomic_private_obj_init(&adev->dm.atomic_obj, > ^~~ > In file included from include/drm/drm_dp_mst_helper.h:27, > from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46, > from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57, > from > drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34: > include/drm/drm_atomic.h:437:6: note: declared here > void drm_atomic_private_obj_init(struct drm_device *dev, > ^~~ > > Caused by commit > > b962a12050a3 ("drm/atomic: integrate modeset lock with private objects") > > interacting with commit > > eb3dc8978596 ("drm/amd/display: Use private obj helpers for > dm_atomic_state") > > from Linus' tree (merged during the merge window). > > Its not obvious how to fix this up, so I have used the drm-misc tree > from next-20190107 for today. https://cgit.freedesktop.org/drm-tip/tree/fixups/drm-misc-next.patch?h=rerere-cache is the fixup you want. Should get baked into drm-next any moment, since the first drm-misc-next pull is already out. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On 1/8/19 3:37 AM, Daniel Vetter wrote: > On Tue, Jan 08, 2019 at 11:12:41AM +1100, Stephen Rothwell wrote: >> Hi all, >> >> After merging the drm-misc tree, today's linux-next build (x86_64 >> allmodconfig) failed like this: >> >> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function >> 'amdgpu_dm_mode_config_init': >> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1695:30: error: >> passing argument 1 of 'drm_atomic_private_obj_init' from incompatible >> pointer type [-Werror=incompatible-pointer-types] >>drm_atomic_private_obj_init(&adev->dm.atomic_obj, >>^~~~ >> In file included from include/drm/drm_dp_mst_helper.h:27, >> from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46, >> from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57, >> from >> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34: >> include/drm/drm_atomic.h:437:53: note: expected 'struct drm_device *' but >> argument is of type 'struct drm_private_obj *' >> void drm_atomic_private_obj_init(struct drm_device *dev, >>~~~^~~ >> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1696:9: error: >> passing argument 2 of 'drm_atomic_private_obj_init' from incompatible >> pointer type [-Werror=incompatible-pointer-types] >> &state->base, >> ^~~~ >> In file included from include/drm/drm_dp_mst_helper.h:27, >> from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46, >> from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57, >> from >> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34: >> include/drm/drm_atomic.h:438:30: note: expected 'struct drm_private_obj *' >> but argument is of type 'struct drm_private_state *' >>struct drm_private_obj *obj, >>^~~ >> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1697:9: error: >> passing argument 3 of 'drm_atomic_private_obj_init' from incompatible >> pointer type [-Werror=incompatible-pointer-types] >> &dm_atomic_state_funcs); >> ^~ >> In file included from include/drm/drm_dp_mst_helper.h:27, >> from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46, >> from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57, >> from >> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34: >> include/drm/drm_atomic.h:439:32: note: expected 'struct drm_private_state *' >> but argument is of type 'struct drm_private_state_funcs *' >>struct drm_private_state *state, >>~~^ >> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1695:2: error: >> too few arguments to function 'drm_atomic_private_obj_init' >>drm_atomic_private_obj_init(&adev->dm.atomic_obj, >>^~~ >> In file included from include/drm/drm_dp_mst_helper.h:27, >> from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46, >> from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57, >> from >> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34: >> include/drm/drm_atomic.h:437:6: note: declared here >> void drm_atomic_private_obj_init(struct drm_device *dev, >>^~~ >> >> Caused by commit >> >>b962a12050a3 ("drm/atomic: integrate modeset lock with private objects") >> >> interacting with commit >> >>eb3dc8978596 ("drm/amd/display: Use private obj helpers for >> dm_atomic_state") >> >> from Linus' tree (merged during the merge window). >> >> Its not obvious how to fix this up, so I have used the drm-misc tree >> from next-20190107 for today. > > https://cgit.freedesktop.org/drm-tip/tree/fixups/drm-misc-next.patch?h=rerere-cache > > is the fixup you want. Should get baked into drm-next any moment, since > the first drm-misc-next pull is already out. > -Daniel > Reviewed-by: Nicholas Kazlauskas Thanks, that lines up with the other driver fixes that patch added. I missed that series when I was developing the private state object patch for amdgpu. I'll still need to remove our extra lock since the objects now have their own, but that can come later in another non-fixup patch. Nicholas Kazlauskas ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi Daniel, On Tue, 8 Jan 2019 09:37:22 +0100 Daniel Vetter wrote: > > > https://cgit.freedesktop.org/drm-tip/tree/fixups/drm-misc-next.patch?h=rerere-cache > > is the fixup you want. Should get baked into drm-next any moment, since > the first drm-misc-next pull is already out. I added that resolution for today, thanks. -- Cheers, Stephen Rothwell pgpYygTl1eIdv.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Thu, 05 Jan 2017, Stephen Rothwell wrote: > Hi all, > > After merging the drm-misc tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > drivers/usb/Kconfig:39:error: recursive dependency detected! > drivers/usb/Kconfig:39: symbol USB is selected by MOUSE_APPLETOUCH > drivers/input/mouse/Kconfig:187:symbol MOUSE_APPLETOUCH depends on > INPUT > drivers/input/Kconfig:8:symbol INPUT is selected by VT > drivers/tty/Kconfig:12: symbol VT is selected by FB_STI > drivers/video/fbdev/Kconfig:678:symbol FB_STI depends on FB > drivers/video/fbdev/Kconfig:5: symbol FB is selected by DRM_KMS_FB_HELPER > drivers/gpu/drm/Kconfig:72: symbol DRM_KMS_FB_HELPER depends on > DRM_KMS_HELPER > drivers/gpu/drm/Kconfig:66: symbol DRM_KMS_HELPER is selected by > DRM_NOUVEAU > drivers/gpu/drm/nouveau/Kconfig:1: symbol DRM_NOUVEAU depends on > LEDS_CLASS > drivers/leds/Kconfig:16:symbol LEDS_CLASS is selected by > OMAP_DEBUG_LEDS > arch/arm/plat-omap/Kconfig:19: symbol OMAP_DEBUG_LEDS depends on NEW_LEDS > drivers/leds/Kconfig:8: symbol NEW_LEDS is selected by ATH9K_HTC > drivers/net/wireless/ath/ath9k/Kconfig:158: symbol ATH9K_HTC depends on > USB > > Caused by commit > > a5ad0fd8524e ("drm: nouveau: fix build when LEDS_CLASS=m") > > I have reverted that commit for today (just because I had to to make > sure that was the problem). Daniel reverted it in drm-misc. BR, Jani. -- Jani Nikula, Intel Open Source Technology Center ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi Jani, On Thu, 05 Jan 2017 12:24:13 +0200 Jani Nikula wrote: > > Daniel reverted it in drm-misc. OK, thanks. -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Wed, Feb 10, 2016 at 12:24:51PM +1100, Stephen Rothwell wrote: > Hi all, > > After merging the drm-misc tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > In file included from drivers/gpu/drm/nouveau/nouveau_drm.c:25:0: > include/linux/apple-gmux.h: In function 'apple_gmux_present': > include/linux/apple-gmux.h:36:42: error: implicit declaration of function > 'acpi_dev_present' [-Werror=implicit-function-declaration] > return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID); > ^ > > Caused by commit > > 2413306c2566 ("apple-gmux: Add helper for presence detect") > > I have used the drm-misc tree from next-20160209 for today. Can you pls attach your .config? The function is there, I suspect we're just missing some depends in Kconfig. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
[cc += Rafael J. Wysocki, linux-acpi] Hi Stephen, On Wed, Feb 10, 2016 at 12:24:51PM +1100, Stephen Rothwell wrote: > Hi all, > > After merging the drm-misc tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > In file included from drivers/gpu/drm/nouveau/nouveau_drm.c:25:0: > include/linux/apple-gmux.h: In function 'apple_gmux_present': > include/linux/apple-gmux.h:36:42: error: implicit declaration of function > 'acpi_dev_present' [-Werror=implicit-function-declaration] > return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID); > ^ > > Caused by commit > > 2413306c2566 ("apple-gmux: Add helper for presence detect") > > I have used the drm-misc tree from next-20160209 for today. Ugh, apologies, I didn't have a non-ACPI platform available to test this on. Solution is to either add to include/linux/acpi.h static inline bool acpi_dev_present(const char *hid) { return false; } somewhere below #else /* !CONFIG_ACPI */ or alternatively to add to include/linux/apple-gmux.h IS_ENABLED(CONFIG_ACPI) in apple_gmux_present(). I'll check the other users of acpi_dev_present() to see which of these two solutions is more appropriate and will post a fix shortly. Thanks a lot for reporting this. Lukas ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi, On Wed, Feb 10, 2016 at 09:41:38AM +0100, Lukas Wunner wrote: > On Wed, Feb 10, 2016 at 12:24:51PM +1100, Stephen Rothwell wrote: > > Hi all, > > > > After merging the drm-misc tree, today's linux-next build (arm > > multi_v7_defconfig) failed like this: > > > > In file included from drivers/gpu/drm/nouveau/nouveau_drm.c:25:0: > > include/linux/apple-gmux.h: In function 'apple_gmux_present': > > include/linux/apple-gmux.h:36:42: error: implicit declaration of function > > 'acpi_dev_present' [-Werror=implicit-function-declaration] > > return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID); > > ^ > > > > Caused by commit > > > > 2413306c2566 ("apple-gmux: Add helper for presence detect") > > > > I have used the drm-misc tree from next-20160209 for today. > > Ugh, apologies, I didn't have a non-ACPI platform available to test > this on. > > Solution is to either add to include/linux/acpi.h > > static inline bool acpi_dev_present(const char *hid) > { > return false; > } > > somewhere below > > #else /* !CONFIG_ACPI */ > > or alternatively to add to include/linux/apple-gmux.h > > IS_ENABLED(CONFIG_ACPI) > > in apple_gmux_present(). > > I'll check the other users of acpi_dev_present() to see which of > these two solutions is more appropriate and will post a fix shortly. The patch included below fixes the build if CONFIG_ACPI is not set. @Daniel Vetter: Would it be possible to squash this with 2413306c2566 ("apple-gmux: Add helper for presence detect") on topic/drm-misc so as to avoid build breakage for anyone trying to bisect between that commit and this fix? I checked all other users of acpi_dev_present() and all of them are only compiled if CONFIG_ACPI is set. Hence I opted to fix this in rather than in . Thanks again Stephen for reporting this at such an early stage, though doubtlessly it would have been better if I had thought of this possibility when preparing the original patch, or if I had compile-tested without CONFIG_ACPI. :-( Lukas -- >8 -- Subject: [PATCH] apple-gmux: Fix build breakage if !CONFIG_ACPI The DRM drivers i915, nouveau and radeon may be compiled with CONFIG_ACPI not set, in which case acpi_dev_present() is undefined. Add a no-op stub for apple_gmux_present() which is used if CONFIG_APPLE_GMUX is not enabled to avoid build breakage. (CONFIG_APPLE_GMUX depends on CONFIG_ACPI.) Reported-by: Stephen Rothwell Signed-off-by: Lukas Wunner --- include/linux/apple-gmux.h | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/include/linux/apple-gmux.h b/include/linux/apple-gmux.h index feebc28..b2d32e0 100644 --- a/include/linux/apple-gmux.h +++ b/include/linux/apple-gmux.h @@ -22,6 +22,8 @@ #define GMUX_ACPI_HID "APP000B" +#if IS_ENABLED(CONFIG_APPLE_GMUX) + /** * apple_gmux_present() - detect if gmux is built into the machine * @@ -33,7 +35,16 @@ */ static inline bool apple_gmux_present(void) { - return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID); + return acpi_dev_present(GMUX_ACPI_HID); } +#else /* !CONFIG_APPLE_GMUX */ + +static inline bool apple_gmux_present(void) +{ + return false; +} + +#endif /* !CONFIG_APPLE_GMUX */ + #endif /* LINUX_APPLE_GMUX_H */ -- 1.8.5.2 (Apple Git-48) ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Wed, Feb 10, 2016 at 02:17:41PM +0100, Lukas Wunner wrote: > Hi, > > On Wed, Feb 10, 2016 at 09:41:38AM +0100, Lukas Wunner wrote: > > On Wed, Feb 10, 2016 at 12:24:51PM +1100, Stephen Rothwell wrote: > > > Hi all, > > > > > > After merging the drm-misc tree, today's linux-next build (arm > > > multi_v7_defconfig) failed like this: > > > > > > In file included from drivers/gpu/drm/nouveau/nouveau_drm.c:25:0: > > > include/linux/apple-gmux.h: In function 'apple_gmux_present': > > > include/linux/apple-gmux.h:36:42: error: implicit declaration of function > > > 'acpi_dev_present' [-Werror=implicit-function-declaration] > > > return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID); > > > ^ > > > > > > Caused by commit > > > > > > 2413306c2566 ("apple-gmux: Add helper for presence detect") > > > > > > I have used the drm-misc tree from next-20160209 for today. > > > > Ugh, apologies, I didn't have a non-ACPI platform available to test > > this on. > > > > Solution is to either add to include/linux/acpi.h > > > > static inline bool acpi_dev_present(const char *hid) > > { > > return false; > > } > > > > somewhere below > > > > #else /* !CONFIG_ACPI */ > > > > or alternatively to add to include/linux/apple-gmux.h > > > > IS_ENABLED(CONFIG_ACPI) > > > > in apple_gmux_present(). > > > > I'll check the other users of acpi_dev_present() to see which of > > these two solutions is more appropriate and will post a fix shortly. > > The patch included below fixes the build if CONFIG_ACPI is not set. > > @Daniel Vetter: Would it be possible to squash this with 2413306c2566 > ("apple-gmux: Add helper for presence detect") on topic/drm-misc so > as to avoid build breakage for anyone trying to bisect between that > commit and this fix? > > I checked all other users of acpi_dev_present() and all of them are > only compiled if CONFIG_ACPI is set. Hence I opted to fix this in > rather than in . > > Thanks again Stephen for reporting this at such an early stage, > though doubtlessly it would have been better if I had thought of > this possibility when preparing the original patch, or if I had > compile-tested without CONFIG_ACPI. :-( Since !ACPI and enabling APPLE_GMUX is a bit a fringe config I don't think this will hurt bisectability at all on a real system. So just applied this one on top of drm-misc. Thanks, Daniel > > Lukas > > -- >8 -- > Subject: [PATCH] apple-gmux: Fix build breakage if !CONFIG_ACPI > > The DRM drivers i915, nouveau and radeon may be compiled with > CONFIG_ACPI not set, in which case acpi_dev_present() is undefined. > > Add a no-op stub for apple_gmux_present() which is used if > CONFIG_APPLE_GMUX is not enabled to avoid build breakage. > (CONFIG_APPLE_GMUX depends on CONFIG_ACPI.) > > Reported-by: Stephen Rothwell > Signed-off-by: Lukas Wunner > --- > include/linux/apple-gmux.h | 13 - > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/include/linux/apple-gmux.h b/include/linux/apple-gmux.h > index feebc28..b2d32e0 100644 > --- a/include/linux/apple-gmux.h > +++ b/include/linux/apple-gmux.h > @@ -22,6 +22,8 @@ > > #define GMUX_ACPI_HID "APP000B" > > +#if IS_ENABLED(CONFIG_APPLE_GMUX) > + > /** > * apple_gmux_present() - detect if gmux is built into the machine > * > @@ -33,7 +35,16 @@ > */ > static inline bool apple_gmux_present(void) > { > - return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID); > + return acpi_dev_present(GMUX_ACPI_HID); > } > > +#else /* !CONFIG_APPLE_GMUX */ > + > +static inline bool apple_gmux_present(void) > +{ > + return false; > +} > + > +#endif /* !CONFIG_APPLE_GMUX */ > + > #endif /* LINUX_APPLE_GMUX_H */ > -- > 1.8.5.2 (Apple Git-48) > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Tue, Jul 14, 2015 at 10:30:56AM +0530, Archit Taneja wrote: > > Hi, > > On 07/14/2015 08:22 AM, Stephen Rothwell wrote: > >Hi all, > > > >After merging the drm-misc tree, today's linux-next build (x86_64 > >allmodconfig) failed like this: > > > >drivers/gpu/drm/virtio/virtgpu_drm_bus.c: In function > >'virtio_pci_kick_out_firmware_fb': > >drivers/gpu/drm/virtio/virtgpu_drm_bus.c:55:2: error: implicit declaration > >of function 'drm_fb_helper_remove_conflicting_framebuffers' > >[-Werror=implicit-function-declaration] > > drm_fb_helper_remove_conflicting_framebuffers(ap, "virtiodrmfb", > > ^ > > > >Caused by commit > > > > 7bd870e7b1c8 ("drm/virtio: Use new drm_fb_helper functions") > > > >I have used the drm-misc tree from next-20150713 for today. > > > >(That commit said "COMPILE TESTED ONLY" :-() > > My bad. The commit messages were for a slightly older version. > I'll fix this, and the warnings in the other mail. Yeah it's a big patch series with a testing chicken-egg problem, so I figured I'll give it a spin in -next. Dropped again until it works better. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi, On 07/14/2015 08:22 AM, Stephen Rothwell wrote: Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/virtio/virtgpu_drm_bus.c: In function 'virtio_pci_kick_out_firmware_fb': drivers/gpu/drm/virtio/virtgpu_drm_bus.c:55:2: error: implicit declaration of function 'drm_fb_helper_remove_conflicting_framebuffers' [-Werror=implicit-function-declaration] drm_fb_helper_remove_conflicting_framebuffers(ap, "virtiodrmfb", ^ Caused by commit 7bd870e7b1c8 ("drm/virtio: Use new drm_fb_helper functions") I have used the drm-misc tree from next-20150713 for today. (That commit said "COMPILE TESTED ONLY" :-() My bad. The commit messages were for a slightly older version. I'll fix this, and the warnings in the other mail. Thanks, Archit -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Thu, Oct 01, 2015 at 12:47:17PM +1000, Stephen Rothwell wrote: > Hi all, > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > ERROR: "drm_agp_release" [drivers/gpu/drm/radeon/radeon.ko] undefined! > ERROR: "drm_agp_acquire" [drivers/gpu/drm/radeon/radeon.ko] undefined! > ERROR: "drm_agp_enable" [drivers/gpu/drm/radeon/radeon.ko] undefined! > ERROR: "drm_agp_info" [drivers/gpu/drm/radeon/radeon.ko] undefined! > ERROR: "drm_agp_release" [drivers/gpu/drm/mga/mga.ko] undefined! > ERROR: "drm_agp_acquire" [drivers/gpu/drm/mga/mga.ko] undefined! > ERROR: "drm_agp_free" [drivers/gpu/drm/mga/mga.ko] undefined! > ERROR: "drm_agp_bind" [drivers/gpu/drm/mga/mga.ko] undefined! > ERROR: "drm_agp_unbind" [drivers/gpu/drm/mga/mga.ko] undefined! > ERROR: "drm_agp_alloc" [drivers/gpu/drm/mga/mga.ko] undefined! > ERROR: "drm_agp_enable" [drivers/gpu/drm/mga/mga.ko] undefined! > ERROR: "drm_agp_info" [drivers/gpu/drm/mga/mga.ko] undefined! > ERROR: "drm_agp_unbind_ioctl" [drivers/gpu/drm/drm.ko] undefined! > ERROR: "drm_agp_init" [drivers/gpu/drm/drm.ko] undefined! > ERROR: "drm_agp_alloc_ioctl" [drivers/gpu/drm/drm.ko] undefined! > ERROR: "drm_agp_clear" [drivers/gpu/drm/drm.ko] undefined! > ERROR: "drm_agp_info_ioctl" [drivers/gpu/drm/drm.ko] undefined! > ERROR: "drm_agp_enable_ioctl" [drivers/gpu/drm/drm.ko] undefined! > ERROR: "drm_agp_release_ioctl" [drivers/gpu/drm/drm.ko] undefined! > ERROR: "drm_agp_bind_ioctl" [drivers/gpu/drm/drm.ko] undefined! > ERROR: "drm_agp_acquire_ioctl" [drivers/gpu/drm/drm.ko] undefined! > ERROR: "drm_agp_free_ioctl" [drivers/gpu/drm/drm.ko] undefined! > > Not quite sure which commit caused this, but I have used the drm-misc > tree from next-20150930 for today. Build fail for CONFIG_AGP=m (bot not y or n). I'm wrestling kbuild atm. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, On Thu, 3 Sep 2015 10:49:19 +1000 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: In function > 'mdp5_plane_cleanup_fb': > drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:272:26: error: 'fb' redeclared as > different kind of symbol > struct drm_framebuffer *fb = old_state->fb; > ^ > drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:267:27: note: previous definition > of 'fb' was here >struct drm_framebuffer *fb, >^ > drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: At top level: > drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: initialization from > incompatible pointer type >.cleanup_fb = mdp5_plane_cleanup_fb, >^ > drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: (near > initialization for 'mdp5_plane_helper_funcs.cleanup_fb') > > Caused by commit > > a317290af0db ("drm/atomic: Make prepare_fb/cleanup_fb only take state, v3") > > Well, that was clearly never build tested :-( > > I have used the drm-misc tree from next-20150902 for today. This is still in today's linux-next :-( -- Cheers, Stephen Rothwells...@canb.auug.org.au ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Op 08-09-15 om 01:42 schreef Stephen Rothwell: > Hi all, > > On Thu, 3 Sep 2015 10:49:19 +1000 Stephen Rothwell > wrote: >> After merging the drm-misc tree, today's linux-next build (arm >> multi_v7_defconfig) failed like this: >> >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: In function >> 'mdp5_plane_cleanup_fb': >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:272:26: error: 'fb' redeclared as >> different kind of symbol >> struct drm_framebuffer *fb = old_state->fb; >> ^ >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:267:27: note: previous definition >> of 'fb' was here >>struct drm_framebuffer *fb, >>^ >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: At top level: >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: initialization >> from incompatible pointer type >>.cleanup_fb = mdp5_plane_cleanup_fb, >>^ >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: (near >> initialization for 'mdp5_plane_helper_funcs.cleanup_fb') >> >> Caused by commit >> >> a317290af0db ("drm/atomic: Make prepare_fb/cleanup_fb only take state, v3") >> >> Well, that was clearly never build tested :-( >> >> I have used the drm-misc tree from next-20150902 for today. > This is still in today's linux-next :-( > I just got around to making an amend fix patch for it yesterday. Can you fold it into v3 daniel? diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c index 4d390b699e9a..a0f5ff0ce8dc 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c @@ -264,7 +264,6 @@ static int mdp5_plane_prepare_fb(struct drm_plane *plane, } static void mdp5_plane_cleanup_fb(struct drm_plane *plane, - struct drm_framebuffer *fb, const struct drm_plane_state *old_state) { struct mdp5_plane *mdp5_plane = to_mdp5_plane(plane); ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Tue, Sep 08, 2015 at 06:48:34AM +0200, Maarten Lankhorst wrote: > Op 08-09-15 om 01:42 schreef Stephen Rothwell: > > Hi all, > > > > On Thu, 3 Sep 2015 10:49:19 +1000 Stephen Rothwell > > wrote: > >> After merging the drm-misc tree, today's linux-next build (arm > >> multi_v7_defconfig) failed like this: > >> > >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: In function > >> 'mdp5_plane_cleanup_fb': > >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:272:26: error: 'fb' redeclared > >> as different kind of symbol > >> struct drm_framebuffer *fb = old_state->fb; > >> ^ > >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:267:27: note: previous > >> definition of 'fb' was here > >>struct drm_framebuffer *fb, > >>^ > >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: At top level: > >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: initialization > >> from incompatible pointer type > >>.cleanup_fb = mdp5_plane_cleanup_fb, > >>^ > >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: (near > >> initialization for 'mdp5_plane_helper_funcs.cleanup_fb') > >> > >> Caused by commit > >> > >> a317290af0db ("drm/atomic: Make prepare_fb/cleanup_fb only take state, > >> v3") > >> > >> Well, that was clearly never build tested :-( > >> > >> I have used the drm-misc tree from next-20150902 for today. > > This is still in today's linux-next :-( > > > I just got around to making an amend fix patch for it yesterday. Can you fold > it into v3 daniel? Squashed in, thanks. -Daniel > > diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c > b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c > index 4d390b699e9a..a0f5ff0ce8dc 100644 > --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c > +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c > @@ -264,7 +264,6 @@ static int mdp5_plane_prepare_fb(struct drm_plane *plane, > } > > static void mdp5_plane_cleanup_fb(struct drm_plane *plane, > - struct drm_framebuffer *fb, > const struct drm_plane_state *old_state) > { > struct mdp5_plane *mdp5_plane = to_mdp5_plane(plane); > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi Dave, The following is now applicable to the drm and staging.current trees ... On Wed, 19 Jul 2017 11:46:57 +1000 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/staging/vboxvideo/vbox_drv.c:235:2: error: unknown field 'set_busid' > specified in initializer > .set_busid = drm_pci_set_busid, > ^ > drivers/staging/vboxvideo/vbox_drv.c:235:15: error: 'drm_pci_set_busid' > undeclared here (not in a function) > .set_busid = drm_pci_set_busid, >^ > drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_init': > drivers/staging/vboxvideo/vbox_drv.c:273:9: error: implicit declaration of > function 'drm_pci_init' [-Werror=implicit-function-declaration] > return drm_pci_init(&driver, &vbox_pci_driver); > ^ > drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_exit': > drivers/staging/vboxvideo/vbox_drv.c:278:2: error: implicit declaration of > function 'drm_pci_exit' [-Werror=implicit-function-declaration] > drm_pci_exit(&driver, &vbox_pci_driver); > ^ > > Caused by commits > > 5c484cee7ef9 ("drm: Remove drm_driver->set_busid hook") > 10631d724def ("drm/pci: Deprecate drm_pci_init/exit completely") > > interacting with commit > > dd55d44f4084 ("staging: vboxvideo: Add vboxvideo to drivers/staging") > > from the staging.current tree. > > I have applied the following merge fix patch - please check that it > is correct. > > From: Stephen Rothwell > Date: Wed, 19 Jul 2017 11:41:01 +1000 > Subject: [PATCH] drm: fixes for staging due to API changes in the drm core > > Signed-off-by: Stephen Rothwell > --- > drivers/staging/vboxvideo/vbox_drv.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/staging/vboxvideo/vbox_drv.c > b/drivers/staging/vboxvideo/vbox_drv.c > index 92ae1560a16d..6d0600c37c0c 100644 > --- a/drivers/staging/vboxvideo/vbox_drv.c > +++ b/drivers/staging/vboxvideo/vbox_drv.c > @@ -232,7 +232,6 @@ static struct drm_driver driver = { > .lastclose = vbox_driver_lastclose, > .master_set = vbox_master_set, > .master_drop = vbox_master_drop, > - .set_busid = drm_pci_set_busid, > > .fops = &vbox_fops, > .irq_handler = vbox_irq_handler, > @@ -270,12 +269,12 @@ static int __init vbox_init(void) > if (vbox_modeset == 0) > return -EINVAL; > > - return drm_pci_init(&driver, &vbox_pci_driver); > + return pci_register_driver(&vbox_pci_driver); > } > > static void __exit vbox_exit(void) > { > - drm_pci_exit(&driver, &vbox_pci_driver); > + pci_unregister_driver(&vbox_pci_driver); > } > > module_init(vbox_init); > -- > 2.13.2 -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi Greg&Hans, How are we going to handle this now? The refactor is deeply burried in drm-misc, I guess you could cherry-pick the relevant patches over. But that'll probably lead to more conflicts because git will get confused. Or you could just delete the set_busid hook in -staging, which renders the driver unbisectable since it'll only work when merged together with the drm trees. This is pretty much why I don't like -staging, it makes cross subsystem refactorings (which is already hard, getting 20+ driver folks to agree on stuff sometimes) unecessarily harder. Cheers, Daniel On Fri, Jul 21, 2017 at 2:08 AM, Stephen Rothwell wrote: > Hi Dave, > > The following is now applicable to the drm and staging.current trees ... > > On Wed, 19 Jul 2017 11:46:57 +1000 Stephen Rothwell > wrote: >> >> After merging the drm-misc tree, today's linux-next build (x86_64 >> allmodconfig) failed like this: >> >> drivers/staging/vboxvideo/vbox_drv.c:235:2: error: unknown field 'set_busid' >> specified in initializer >> .set_busid = drm_pci_set_busid, >> ^ >> drivers/staging/vboxvideo/vbox_drv.c:235:15: error: 'drm_pci_set_busid' >> undeclared here (not in a function) >> .set_busid = drm_pci_set_busid, >>^ >> drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_init': >> drivers/staging/vboxvideo/vbox_drv.c:273:9: error: implicit declaration of >> function 'drm_pci_init' [-Werror=implicit-function-declaration] >> return drm_pci_init(&driver, &vbox_pci_driver); >> ^ >> drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_exit': >> drivers/staging/vboxvideo/vbox_drv.c:278:2: error: implicit declaration of >> function 'drm_pci_exit' [-Werror=implicit-function-declaration] >> drm_pci_exit(&driver, &vbox_pci_driver); >> ^ >> >> Caused by commits >> >> 5c484cee7ef9 ("drm: Remove drm_driver->set_busid hook") >> 10631d724def ("drm/pci: Deprecate drm_pci_init/exit completely") >> >> interacting with commit >> >> dd55d44f4084 ("staging: vboxvideo: Add vboxvideo to drivers/staging") >> >> from the staging.current tree. >> >> I have applied the following merge fix patch - please check that it >> is correct. >> >> From: Stephen Rothwell >> Date: Wed, 19 Jul 2017 11:41:01 +1000 >> Subject: [PATCH] drm: fixes for staging due to API changes in the drm core >> >> Signed-off-by: Stephen Rothwell >> --- >> drivers/staging/vboxvideo/vbox_drv.c | 5 ++--- >> 1 file changed, 2 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/staging/vboxvideo/vbox_drv.c >> b/drivers/staging/vboxvideo/vbox_drv.c >> index 92ae1560a16d..6d0600c37c0c 100644 >> --- a/drivers/staging/vboxvideo/vbox_drv.c >> +++ b/drivers/staging/vboxvideo/vbox_drv.c >> @@ -232,7 +232,6 @@ static struct drm_driver driver = { >> .lastclose = vbox_driver_lastclose, >> .master_set = vbox_master_set, >> .master_drop = vbox_master_drop, >> - .set_busid = drm_pci_set_busid, >> >> .fops = &vbox_fops, >> .irq_handler = vbox_irq_handler, >> @@ -270,12 +269,12 @@ static int __init vbox_init(void) >> if (vbox_modeset == 0) >> return -EINVAL; >> >> - return drm_pci_init(&driver, &vbox_pci_driver); >> + return pci_register_driver(&vbox_pci_driver); >> } >> >> static void __exit vbox_exit(void) >> { >> - drm_pci_exit(&driver, &vbox_pci_driver); >> + pci_unregister_driver(&vbox_pci_driver); >> } >> >> module_init(vbox_init); >> -- >> 2.13.2 > > -- > Cheers, > Stephen Rothwell -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi, On 21-07-17 09:24, Daniel Vetter wrote: Hi Greg&Hans, How are we going to handle this now? The refactor is deeply burried in drm-misc, I guess you could cherry-pick the relevant patches over. But that'll probably lead to more conflicts because git will get confused. Or you could just delete the set_busid hook in -staging, which renders the driver unbisectable since it'll only work when merged together with the drm trees. Removing the set_busid hook in staging (but only for -next, not for -linus) is fine with me. Regards, Hans ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi Daniel, On Fri, 21 Jul 2017 09:24:49 +0200 Daniel Vetter wrote: > > How are we going to handle this now? The refactor is deeply burried in > drm-misc, I guess you could cherry-pick the relevant patches over. But > that'll probably lead to more conflicts because git will get confused. I'll just keep applying the merge resolution patch and will remind Dave and Greg about it during the week before the merge window opens so that they can let Linus know that the fix up is needed. -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Mon, Jul 24, 2017 at 2:03 AM, Stephen Rothwell wrote: > Hi Daniel, > > On Fri, 21 Jul 2017 09:24:49 +0200 Daniel Vetter > wrote: >> >> How are we going to handle this now? The refactor is deeply burried in >> drm-misc, I guess you could cherry-pick the relevant patches over. But >> that'll probably lead to more conflicts because git will get confused. > > I'll just keep applying the merge resolution patch and will remind Dave > and Greg about it during the week before the merge window opens so that > they can let Linus know that the fix up is needed. Well, Greg squeezed the vbox driver into -rc2, so now we already get to resolve this in a backmerge. And hopefully the bikeshed patches in -staging won't interfere too badly with whatever refactoring we'll do in drm-next. Greg, fyi this is the last time I'll ack a drm driver for staging. This just doesn't work. We're spending more time here working the -staging vs. drm-next conflicts than the actual vbox driver review has taken me. And probly less than the cleanup for merging directly to drm-next will end up taking. Thanks, Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Mon, Jul 24, 2017 at 10:24:41AM +0200, Daniel Vetter wrote: > On Mon, Jul 24, 2017 at 2:03 AM, Stephen Rothwell > wrote: > > Hi Daniel, > > > > On Fri, 21 Jul 2017 09:24:49 +0200 Daniel Vetter > > wrote: > >> > >> How are we going to handle this now? The refactor is deeply burried in > >> drm-misc, I guess you could cherry-pick the relevant patches over. But > >> that'll probably lead to more conflicts because git will get confused. > > > > I'll just keep applying the merge resolution patch and will remind Dave > > and Greg about it during the week before the merge window opens so that > > they can let Linus know that the fix up is needed. > > Well, Greg squeezed the vbox driver into -rc2, so now we already get > to resolve this in a backmerge. And hopefully the bikeshed patches in > -staging won't interfere too badly with whatever refactoring we'll do > in drm-next. > > Greg, fyi this is the last time I'll ack a drm driver for staging. > This just doesn't work. We're spending more time here working the > -staging vs. drm-next conflicts than the actual vbox driver review has > taken me. And probly less than the cleanup for merging directly to > drm-next will end up taking. Hey, I was amazed that you all acked it, and it's why I required that you do so before I took it :) Good luck with the merges! greg k-h ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, On Fri, 21 Apr 2017 12:10:14 +1000 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/tee/tee_shm.c:87:2: error: unknown field 'kmap_atomic' specified in > initializer > .kmap_atomic = tee_shm_op_kmap_atomic, > ^ > drivers/tee/tee_shm.c:87:17: error: initialization from incompatible pointer > type [-Werror=incompatible-pointer-types] > .kmap_atomic = tee_shm_op_kmap_atomic, > ^ > drivers/tee/tee_shm.c:87:17: note: (near initialization for > 'tee_shm_dma_buf_ops.begin_cpu_access') > drivers/tee/tee_shm.c:88:2: error: unknown field 'kmap' specified in > initializer > .kmap = tee_shm_op_kmap, > ^ > drivers/tee/tee_shm.c:88:10: error: initialization from incompatible pointer > type [-Werror=incompatible-pointer-types] > .kmap = tee_shm_op_kmap, > ^ > drivers/tee/tee_shm.c:88:10: note: (near initialization for > 'tee_shm_dma_buf_ops.end_cpu_access') > > Caused by commit > > f9b67f0014cb ("dma-buf: Rename dma-ops to prevent conflict with > kunmap_atomic macro") > > interacting with commit > > 967c9cca2cc5 ("tee: generic TEE subsystem") > > from the arm-soc tree. > > I applied the following merge fix patch for today: > > From: Stephen Rothwell > Date: Fri, 21 Apr 2017 12:06:32 +1000 > Subject: [PATCH] tee: merge fix for dma-ops field name changes > > Signed-off-by: Stephen Rothwell > --- > drivers/tee/tee_shm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c > index 0be1e3e93bee..4e14c9c9cb1c 100644 > --- a/drivers/tee/tee_shm.c > +++ b/drivers/tee/tee_shm.c > @@ -84,8 +84,8 @@ static struct dma_buf_ops tee_shm_dma_buf_ops = { > .map_dma_buf = tee_shm_op_map_dma_buf, > .unmap_dma_buf = tee_shm_op_unmap_dma_buf, > .release = tee_shm_op_release, > - .kmap_atomic = tee_shm_op_kmap_atomic, > - .kmap = tee_shm_op_kmap, > + .map_atomic = tee_shm_op_kmap_atomic, > + .map = tee_shm_op_kmap, > .mmap = tee_shm_op_mmap, > }; > > -- > 2.11.0 This fixup is now needed when merging the arm-soc tree with Linus' tree. -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Wed, Dec 06, 2017 at 01:00:15AM +, Stephen Rothwell wrote: > Hi all, Hi Stephen, I had just written the email for you about this. Feel free to ignore that one since you already found the solution and sorry for the delay on warning you. > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/gpu/drm/i915/intel_dsi.c: In function > 'intel_dsi_get_panel_orientation': > drivers/gpu/drm/i915/intel_dsi.c:1673:13: error: storage size of 'plane' > isn't known > enum plane plane; > ^ > > Caused by commit > > 82daca297506 ("drm/i915: Add "panel orientation" property to the panel > connector, v6.") > > interacting with commit > > ed15030d7ab0 ("drm/i915: s/enum plane/enum i9xx_plane_id/") > > from the drm-intel tree. > > I have applied the following merge fix patch for today. Yes, that's the right one. Thanks, Rodrigo. > > From: Stephen Rothwell > Date: Wed, 6 Dec 2017 11:56:32 +1100 > Subject: [PATCH] drm/i915: fix up for "drm/i915: s/enum plane/enum > i9xx_plane_id/" > > Signed-off-by: Stephen Rothwell > --- > drivers/gpu/drm/i915/intel_dsi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_dsi.c > b/drivers/gpu/drm/i915/intel_dsi.c > index 1b60df3c14a0..f67d321376e4 100644 > --- a/drivers/gpu/drm/i915/intel_dsi.c > +++ b/drivers/gpu/drm/i915/intel_dsi.c > @@ -1670,7 +1670,7 @@ static int intel_dsi_get_panel_orientation(struct > intel_connector *connector) > { > struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > int orientation = DRM_MODE_PANEL_ORIENTATION_NORMAL; > - enum plane plane; > + enum i9xx_plane_id plane; > u32 val; > > if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { > -- > 2.15.0 > > -- > Cheers, > Stephen Rothwell > ___ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi Rodrigo, On Tue, 5 Dec 2017 17:21:54 -0800 Rodrigo Vivi wrote: > > I had just written the email for you about this. > Feel free to ignore that one since you already found the solution > and sorry for the delay on warning you. And I should read all my email before responding to earlier ones :-) -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Thanks for this. This and "drm/vmwgfx: merge fixup for set_config API change": Reviewed-by: Sinclair Yeh On Mon, Apr 03, 2017 at 01:31:29PM +1000, Stephen Rothwell wrote: > Hi all, > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c: In function 'vmw_sou_crtc_page_flip': > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c:327:8: error: too few arguments to > function 'drm_atomic_helper_page_flip' > ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags); > ^ > In file included from drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c:31:0: > include/drm/drm_atomic_helper.h:126:5: note: declared here > int drm_atomic_helper_page_flip(struct drm_crtc *crtc, > ^ > drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c: In function 'vmw_stdu_crtc_page_flip': > drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c:508:8: error: too few arguments to > function 'drm_atomic_helper_page_flip' > ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags); > ^ > In file included from drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c:32:0: > include/drm/drm_atomic_helper.h:126:5: note: declared here > int drm_atomic_helper_page_flip(struct drm_crtc *crtc, > ^ > > Caused by commit > > 41292b1fa13a ("drm: Add acquire ctx parameter to ->page_flip(_target)") > > interacting with commits > > 904bb5e5817f ("drm/vmwgfx: Switch over to internal atomic API for STDU") > b0119cb9229d ("drm/vmwgfx: Switch over to internal atomic API for SOU and > LDU") > > from the drm tree. > > I added this merge fix patch for today: > > From: Stephen Rothwell > Date: Mon, 3 Apr 2017 13:25:55 +1000 > Subject: [PATCH] drm/vmwgfx: merge fixup for page_flip API change > > Signed-off-by: Stephen Rothwell > --- > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +- > drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > index 02b8f2541dca..8d7dc9def7c2 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > @@ -324,7 +324,7 @@ static int vmw_sou_crtc_page_flip(struct drm_crtc *crtc, > return -EINVAL; > > flags &= ~DRM_MODE_PAGE_FLIP_ASYNC; > - ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags); > + ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags, ctx); > if (ret) { > DRM_ERROR("Page flip error %d.\n", ret); > return ret; > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > index e59bbcd8b226..bad31bdf09b6 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > @@ -505,7 +505,7 @@ static int vmw_stdu_crtc_page_flip(struct drm_crtc *crtc, >* don't hand it to the helper. >*/ > flags &= ~DRM_MODE_PAGE_FLIP_ASYNC; > - ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags); > + ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags, ctx); > if (ret) { > DRM_ERROR("Page flip error %d.\n", ret); > return ret; > -- > 2.11.0 > > -- > Cheers, > Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Thanks Stephen. Looks good to me. Logan On 20/04/17 08:10 PM, Stephen Rothwell wrote: > Hi all, > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/tee/tee_shm.c:87:2: error: unknown field 'kmap_atomic' specified in > initializer > .kmap_atomic = tee_shm_op_kmap_atomic, > ^ > drivers/tee/tee_shm.c:87:17: error: initialization from incompatible pointer > type [-Werror=incompatible-pointer-types] > .kmap_atomic = tee_shm_op_kmap_atomic, > ^ > drivers/tee/tee_shm.c:87:17: note: (near initialization for > 'tee_shm_dma_buf_ops.begin_cpu_access') > drivers/tee/tee_shm.c:88:2: error: unknown field 'kmap' specified in > initializer > .kmap = tee_shm_op_kmap, > ^ > drivers/tee/tee_shm.c:88:10: error: initialization from incompatible pointer > type [-Werror=incompatible-pointer-types] > .kmap = tee_shm_op_kmap, > ^ > drivers/tee/tee_shm.c:88:10: note: (near initialization for > 'tee_shm_dma_buf_ops.end_cpu_access') > > Caused by commit > > f9b67f0014cb ("dma-buf: Rename dma-ops to prevent conflict with > kunmap_atomic macro") > > interacting with commit > > 967c9cca2cc5 ("tee: generic TEE subsystem") > > from the arm-soc tree. > > I applied the following merge fix patch for today: > > From: Stephen Rothwell > Date: Fri, 21 Apr 2017 12:06:32 +1000 > Subject: [PATCH] tee: merge fix for dma-ops field name changes > > Signed-off-by: Stephen Rothwell > --- > drivers/tee/tee_shm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c > index 0be1e3e93bee..4e14c9c9cb1c 100644 > --- a/drivers/tee/tee_shm.c > +++ b/drivers/tee/tee_shm.c > @@ -84,8 +84,8 @@ static struct dma_buf_ops tee_shm_dma_buf_ops = { > .map_dma_buf = tee_shm_op_map_dma_buf, > .unmap_dma_buf = tee_shm_op_unmap_dma_buf, > .release = tee_shm_op_release, > - .kmap_atomic = tee_shm_op_kmap_atomic, > - .kmap = tee_shm_op_kmap, > + .map_atomic = tee_shm_op_kmap_atomic, > + .map = tee_shm_op_kmap, > .mmap = tee_shm_op_mmap, > }; > > ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, On Fri, 21 Apr 2017 12:10:14 +1000 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/tee/tee_shm.c:87:2: error: unknown field 'kmap_atomic' specified in > initializer > .kmap_atomic = tee_shm_op_kmap_atomic, > ^ > drivers/tee/tee_shm.c:87:17: error: initialization from incompatible pointer > type [-Werror=incompatible-pointer-types] > .kmap_atomic = tee_shm_op_kmap_atomic, > ^ > drivers/tee/tee_shm.c:87:17: note: (near initialization for > 'tee_shm_dma_buf_ops.begin_cpu_access') > drivers/tee/tee_shm.c:88:2: error: unknown field 'kmap' specified in > initializer > .kmap = tee_shm_op_kmap, > ^ > drivers/tee/tee_shm.c:88:10: error: initialization from incompatible pointer > type [-Werror=incompatible-pointer-types] > .kmap = tee_shm_op_kmap, > ^ > drivers/tee/tee_shm.c:88:10: note: (near initialization for > 'tee_shm_dma_buf_ops.end_cpu_access') > > Caused by commit > > f9b67f0014cb ("dma-buf: Rename dma-ops to prevent conflict with > kunmap_atomic macro") > > interacting with commit > > 967c9cca2cc5 ("tee: generic TEE subsystem") > > from the arm-soc tree. > > I applied the following merge fix patch for today: > > From: Stephen Rothwell > Date: Fri, 21 Apr 2017 12:06:32 +1000 > Subject: [PATCH] tee: merge fix for dma-ops field name changes > > Signed-off-by: Stephen Rothwell > --- > drivers/tee/tee_shm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c > index 0be1e3e93bee..4e14c9c9cb1c 100644 > --- a/drivers/tee/tee_shm.c > +++ b/drivers/tee/tee_shm.c > @@ -84,8 +84,8 @@ static struct dma_buf_ops tee_shm_dma_buf_ops = { > .map_dma_buf = tee_shm_op_map_dma_buf, > .unmap_dma_buf = tee_shm_op_unmap_dma_buf, > .release = tee_shm_op_release, > - .kmap_atomic = tee_shm_op_kmap_atomic, > - .kmap = tee_shm_op_kmap, > + .map_atomic = tee_shm_op_kmap_atomic, > + .map = tee_shm_op_kmap, > .mmap = tee_shm_op_mmap, > }; > > -- > 2.11.0 This merge fix is now needed when I merge the drm tree (as Dave merged the drm-misc tree). -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Mon, Apr 24, 2017 at 11:25:12AM +1000, Stephen Rothwell wrote: > Hi all, > > On Fri, 21 Apr 2017 12:10:14 +1000 Stephen Rothwell > wrote: > > > > After merging the drm-misc tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > > > > drivers/tee/tee_shm.c:87:2: error: unknown field 'kmap_atomic' specified in > > initializer > > .kmap_atomic = tee_shm_op_kmap_atomic, > > ^ > > drivers/tee/tee_shm.c:87:17: error: initialization from incompatible > > pointer type [-Werror=incompatible-pointer-types] > > .kmap_atomic = tee_shm_op_kmap_atomic, > > ^ > > drivers/tee/tee_shm.c:87:17: note: (near initialization for > > 'tee_shm_dma_buf_ops.begin_cpu_access') > > drivers/tee/tee_shm.c:88:2: error: unknown field 'kmap' specified in > > initializer > > .kmap = tee_shm_op_kmap, > > ^ > > drivers/tee/tee_shm.c:88:10: error: initialization from incompatible > > pointer type [-Werror=incompatible-pointer-types] > > .kmap = tee_shm_op_kmap, > > ^ > > drivers/tee/tee_shm.c:88:10: note: (near initialization for > > 'tee_shm_dma_buf_ops.end_cpu_access') > > > > Caused by commit > > > > f9b67f0014cb ("dma-buf: Rename dma-ops to prevent conflict with > > kunmap_atomic macro") > > > > interacting with commit > > > > 967c9cca2cc5 ("tee: generic TEE subsystem") > > > > from the arm-soc tree. > > > > I applied the following merge fix patch for today: > > > > From: Stephen Rothwell > > Date: Fri, 21 Apr 2017 12:06:32 +1000 > > Subject: [PATCH] tee: merge fix for dma-ops field name changes > > > > Signed-off-by: Stephen Rothwell > > --- > > drivers/tee/tee_shm.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c > > index 0be1e3e93bee..4e14c9c9cb1c 100644 > > --- a/drivers/tee/tee_shm.c > > +++ b/drivers/tee/tee_shm.c > > @@ -84,8 +84,8 @@ static struct dma_buf_ops tee_shm_dma_buf_ops = { > > .map_dma_buf = tee_shm_op_map_dma_buf, > > .unmap_dma_buf = tee_shm_op_unmap_dma_buf, > > .release = tee_shm_op_release, > > - .kmap_atomic = tee_shm_op_kmap_atomic, > > - .kmap = tee_shm_op_kmap, > > + .map_atomic = tee_shm_op_kmap_atomic, > > + .map = tee_shm_op_kmap, > > .mmap = tee_shm_op_mmap, > > }; Since this is an all-new driver it might be best to stagger the pull requests and merge the new tee subsystem (or whatever it is) after drm? Not sure what to best do here ... -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi Daniel, On Tue, 2 May 2017 10:25:18 +0200 Daniel Vetter wrote: > > Since this is an all-new driver it might be best to stagger the pull > requests and merge the new tee subsystem (or whatever it is) after drm? > > Not sure what to best do here ... This will merge via Dave, so Dave just needs to let Linus know that a fix up is needed when this merges with the arm-soc stuff in Linus' tree. -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Tue, May 2, 2017 at 10:41 AM, Stephen Rothwell wrote: > Hi Daniel, > > On Tue, 2 May 2017 10:25:18 +0200 Daniel Vetter wrote: >> >> Since this is an all-new driver it might be best to stagger the pull >> requests and merge the new tee subsystem (or whatever it is) after drm? >> >> Not sure what to best do here ... > > This will merge via Dave, so Dave just needs to let Linus know that a > fix up is needed when this merges with the arm-soc stuff in Linus' tree. The TEE subsystem is currently on a separate branch by itself in arm-soc, so we could easily delay that until DRM is in, and point out the resolution here. Arnd ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Tue, May 2, 2017 at 10:55 AM, Arnd Bergmann wrote: > On Tue, May 2, 2017 at 10:41 AM, Stephen Rothwell > wrote: >> Hi Daniel, >> >> On Tue, 2 May 2017 10:25:18 +0200 Daniel Vetter wrote: >>> >>> Since this is an all-new driver it might be best to stagger the pull >>> requests and merge the new tee subsystem (or whatever it is) after drm? >>> >>> Not sure what to best do here ... >> >> This will merge via Dave, so Dave just needs to let Linus know that a >> fix up is needed when this merges with the arm-soc stuff in Linus' tree. > > The TEE subsystem is currently on a separate branch by itself in arm-soc, > so we could easily delay that until DRM is in, and point out the resolution > here. Dave is somewhere without mail, but I chatted with him quickly and he agrees this seems simplest. drm-next main pull should go out somewhere tomorrow he said. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
uhh, that's on me. I will send out a patch today. I just noticed that the config file I used for testing had WERROR disabled. On Tue, Oct 12, 2021 at 4:18 AM Stephen Rothwell wrote: > > Hi all, > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c: In function > 'gp100_vmm_fault_cancel': > drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c:491:6: error: unused > variable 'inst' [-Werror=unused-variable] > 491 | u32 inst, aper; > | ^~~~ > cc1: all warnings being treated as errors > > Caused by commit > > 404046cf4805 ("drm/nouveau/mmu/gp100-: drop unneeded assignment in the if > condition.") > > I have used the drm-misc tree from next-20211011 for today. > > -- > Cheers, > Stephen Rothwell
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Thu, Oct 14, 2021 at 5:02 AM wrote: > > Hi, > > I review the code. > > It seems I forget to delete the definition of the variable "inst",I'm sry for > that.: ( > > I'll submit another patch soon. > I already wrote the patch and pushed it: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit?id=381ba6a6baf104b572379c6b2deab884555104d4 > > > Hi all, > > > > After merging the drm-misc tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > > > > drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c: In function > > 'gp100_vmm_fault_cancel': > > drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c:491:6: error: unused > > variable 'inst' [-Werror=unused-variable] > > 491 | u32 inst, aper; > > | ^~~~ > > cc1: all warnings being treated as errors > > > > Caused by commit > > > > 404046cf4805 ("drm/nouveau/mmu/gp100-: drop unneeded assignment in the if > > condition.") > > > > I have used the drm-misc tree from next-20211011 for today. > > > > -- > > Cheers, > > Stephen Rothwell
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi, I review the code. It seems I forget to delete the definition of the variable "inst",I'm sry for that.: ( I'll submit another patch soon. > Hi all,> > After merging the drm-misc tree, today's linux-next build (x86_64> > allmodconfig) failed like this:> > > drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c: In function > 'gp100_vmm_fault_cancel':> > drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c:491:6: error: unused > variable 'inst' [-Werror=unused-variable]> 491 | u32 inst, aper;> | > ^~~~> cc1: all warnings being treated as errors> > Caused by commit> > > 404046cf4805 ("drm/nouveau/mmu/gp100-: drop unneeded assignment in the if > condition.")>> I have used the drm-misc tree from next-20211011 for today.> > > -- > Cheers,> Stephen Rothwell
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Fri, 15 Oct 2021, Stephen Rothwell wrote: > Hi all, > > After merging the drm-misc tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for > '__stack_depot_save' > 111 | static depot_stack_handle_t __stack_depot_save(void) > | ^~ > In file included from include/linux/page_ext.h:7, > from include/linux/mm.h:25, > from include/linux/kallsyms.h:13, > from include/linux/bpf.h:20, > from include/linux/bpf-cgroup.h:5, > from include/linux/cgroup-defs.h:22, > from include/linux/cgroup.h:28, > from include/linux/memcontrol.h:13, > from include/linux/swap.h:9, > from include/linux/suspend.h:5, > from include/linux/regulator/consumer.h:35, > from include/linux/i2c.h:18, > from include/drm/drm_crtc.h:28, > from include/drm/drm_atomic.h:31, > from drivers/gpu/drm/drm_modeset_lock.c:24: > include/linux/stackdepot.h:18:22: note: previous declaration of > '__stack_depot_save' was here >18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries, > | ^~ > > Caused by commit > > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks > without backoff") > > This may only have been revealed because of another fix I have had to > apply today. > > I have applied the following patch for today. > > From: Stephen Rothwell > Date: Fri, 15 Oct 2021 20:17:52 +1100 > Subject: [PATCH] drm/locking: fix for name conflict > > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks > without backoff") > Signed-off-by: Stephen Rothwell My bad, what was I thinking using stack depot's "namespace". The fix looks good, but I'd rename __stack_depot_print too added in the same commit. Do you want to respin or shall I take it from here? Thanks, Jani. > --- > drivers/gpu/drm/drm_modeset_lock.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/drm_modeset_lock.c > b/drivers/gpu/drm/drm_modeset_lock.c > index 4d32b61fa1fd..ee36dd20900d 100644 > --- a/drivers/gpu/drm/drm_modeset_lock.c > +++ b/drivers/gpu/drm/drm_modeset_lock.c > @@ -79,7 +79,7 @@ > static DEFINE_WW_CLASS(crtc_ww_class); > > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK) > -static noinline depot_stack_handle_t __stack_depot_save(void) > +static noinline depot_stack_handle_t __drm_stack_depot_save(void) > { > unsigned long entries[8]; > unsigned int n; > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t > stack_depot) > kfree(buf); > } > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */ > -static depot_stack_handle_t __stack_depot_save(void) > +static depot_stack_handle_t __drm_stack_depot_save(void) > { > return 0; > } > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock > *lock, > ret = 0; > } else if (ret == -EDEADLK) { > ctx->contended = lock; > - ctx->stack_depot = __stack_depot_save(); > + ctx->stack_depot = __drm_stack_depot_save(); > } > > return ret; > -- > 2.33.0 -- Jani Nikula, Intel Open Source Graphics Center
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi Jani, On Fri, 15 Oct 2021 12:56:58 +0300 Jani Nikula wrote: > > The fix looks good, but I'd rename __stack_depot_print too added in the > same commit. Do you want to respin or shall I take it from here? If you are happy to take it on, then thanks. -- Cheers, Stephen Rothwell pgpMOSQCTIEFb.pgp Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for > '__stack_depot_save' > 111 | static depot_stack_handle_t __stack_depot_save(void) > | ^~ > In file included from include/linux/page_ext.h:7, > from include/linux/mm.h:25, > from include/linux/kallsyms.h:13, > from include/linux/bpf.h:20, > from include/linux/bpf-cgroup.h:5, > from include/linux/cgroup-defs.h:22, > from include/linux/cgroup.h:28, > from include/linux/memcontrol.h:13, > from include/linux/swap.h:9, > from include/linux/suspend.h:5, > from include/linux/regulator/consumer.h:35, > from include/linux/i2c.h:18, > from include/drm/drm_crtc.h:28, > from include/drm/drm_atomic.h:31, > from drivers/gpu/drm/drm_modeset_lock.c:24: > include/linux/stackdepot.h:18:22: note: previous declaration of > '__stack_depot_save' was here >18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries, > | ^~ > > Caused by commit > > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks > without backoff") > > This may only have been revealed because of another fix I have had to > apply today. > > I have applied the following patch for today. > > From: Stephen Rothwell > Date: Fri, 15 Oct 2021 20:17:52 +1100 > Subject: [PATCH] drm/locking: fix for name conflict > > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks > without backoff") > Signed-off-by: Stephen Rothwell > --- > drivers/gpu/drm/drm_modeset_lock.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/drm_modeset_lock.c > b/drivers/gpu/drm/drm_modeset_lock.c > index 4d32b61fa1fd..ee36dd20900d 100644 > --- a/drivers/gpu/drm/drm_modeset_lock.c > +++ b/drivers/gpu/drm/drm_modeset_lock.c > @@ -79,7 +79,7 @@ > static DEFINE_WW_CLASS(crtc_ww_class); > > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK) > -static noinline depot_stack_handle_t __stack_depot_save(void) > +static noinline depot_stack_handle_t __drm_stack_depot_save(void) > { > unsigned long entries[8]; > unsigned int n; > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t > stack_depot) > kfree(buf); > } > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */ > -static depot_stack_handle_t __stack_depot_save(void) > +static depot_stack_handle_t __drm_stack_depot_save(void) > { > return 0; > } > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock > *lock, > ret = 0; > } else if (ret == -EDEADLK) { > ctx->contended = lock; > - ctx->stack_depot = __stack_depot_save(); > + ctx->stack_depot = __drm_stack_depot_save(); > } > > return ret; > -- > 2.33.0 This has reappeared today. I don't know what happened to the drm-misc tree over the weeked :-( I have reapplied the above fix. -- Cheers, Stephen Rothwell pgpEVbJac_cxP.pgp Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, On Mon, 1 Nov 2021 19:42:23 +1100 Stephen Rothwell wrote: > > On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell > wrote: > > > > After merging the drm-misc tree, today's linux-next build (arm > > multi_v7_defconfig) failed like this: > > > > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for > > '__stack_depot_save' > > 111 | static depot_stack_handle_t __stack_depot_save(void) > > | ^~ > > In file included from include/linux/page_ext.h:7, > > from include/linux/mm.h:25, > > from include/linux/kallsyms.h:13, > > from include/linux/bpf.h:20, > > from include/linux/bpf-cgroup.h:5, > > from include/linux/cgroup-defs.h:22, > > from include/linux/cgroup.h:28, > > from include/linux/memcontrol.h:13, > > from include/linux/swap.h:9, > > from include/linux/suspend.h:5, > > from include/linux/regulator/consumer.h:35, > > from include/linux/i2c.h:18, > > from include/drm/drm_crtc.h:28, > > from include/drm/drm_atomic.h:31, > > from drivers/gpu/drm/drm_modeset_lock.c:24: > > include/linux/stackdepot.h:18:22: note: previous declaration of > > '__stack_depot_save' was here > >18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries, > > | ^~ > > > > Caused by commit > > > > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks > > without backoff") > > > > This may only have been revealed because of another fix I have had to > > apply today. > > > > I have applied the following patch for today. > > > > From: Stephen Rothwell > > Date: Fri, 15 Oct 2021 20:17:52 +1100 > > Subject: [PATCH] drm/locking: fix for name conflict > > > > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended > > locks without backoff") > > Signed-off-by: Stephen Rothwell > > --- > > drivers/gpu/drm/drm_modeset_lock.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/drm_modeset_lock.c > > b/drivers/gpu/drm/drm_modeset_lock.c > > index 4d32b61fa1fd..ee36dd20900d 100644 > > --- a/drivers/gpu/drm/drm_modeset_lock.c > > +++ b/drivers/gpu/drm/drm_modeset_lock.c > > @@ -79,7 +79,7 @@ > > static DEFINE_WW_CLASS(crtc_ww_class); > > > > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK) > > -static noinline depot_stack_handle_t __stack_depot_save(void) > > +static noinline depot_stack_handle_t __drm_stack_depot_save(void) > > { > > unsigned long entries[8]; > > unsigned int n; > > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t > > stack_depot) > > kfree(buf); > > } > > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */ > > -static depot_stack_handle_t __stack_depot_save(void) > > +static depot_stack_handle_t __drm_stack_depot_save(void) > > { > > return 0; > > } > > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock > > *lock, > > ret = 0; > > } else if (ret == -EDEADLK) { > > ctx->contended = lock; > > - ctx->stack_depot = __stack_depot_save(); > > + ctx->stack_depot = __drm_stack_depot_save(); > > } > > > > return ret; > > This has reappeared today. I don't know what happened to the drm-misc > tree over the weeked :-( > > I have reapplied the above fix. So the above drm-misc commit is now in the drm tree, but its fix up commit vanished from the drm-misc tree over the past weekend :-( -- Cheers, Stephen Rothwell pgpMPG5tnwhBT.pgp Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Fri, 05 Nov 2021, Stephen Rothwell wrote: > Hi all, > > On Mon, 1 Nov 2021 19:42:23 +1100 Stephen Rothwell > wrote: >> >> On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell >> wrote: >> > >> > After merging the drm-misc tree, today's linux-next build (arm >> > multi_v7_defconfig) failed like this: >> > >> > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for >> > '__stack_depot_save' >> > 111 | static depot_stack_handle_t __stack_depot_save(void) >> > | ^~ >> > In file included from include/linux/page_ext.h:7, >> > from include/linux/mm.h:25, >> > from include/linux/kallsyms.h:13, >> > from include/linux/bpf.h:20, >> > from include/linux/bpf-cgroup.h:5, >> > from include/linux/cgroup-defs.h:22, >> > from include/linux/cgroup.h:28, >> > from include/linux/memcontrol.h:13, >> > from include/linux/swap.h:9, >> > from include/linux/suspend.h:5, >> > from include/linux/regulator/consumer.h:35, >> > from include/linux/i2c.h:18, >> > from include/drm/drm_crtc.h:28, >> > from include/drm/drm_atomic.h:31, >> > from drivers/gpu/drm/drm_modeset_lock.c:24: >> > include/linux/stackdepot.h:18:22: note: previous declaration of >> > '__stack_depot_save' was here >> >18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries, >> > | ^~ >> > >> > Caused by commit >> > >> > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks >> > without backoff") >> > >> > This may only have been revealed because of another fix I have had to >> > apply today. >> > >> > I have applied the following patch for today. >> > >> > From: Stephen Rothwell >> > Date: Fri, 15 Oct 2021 20:17:52 +1100 >> > Subject: [PATCH] drm/locking: fix for name conflict >> > >> > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended >> > locks without backoff") >> > Signed-off-by: Stephen Rothwell >> > --- >> > drivers/gpu/drm/drm_modeset_lock.c | 6 +++--- >> > 1 file changed, 3 insertions(+), 3 deletions(-) >> > >> > diff --git a/drivers/gpu/drm/drm_modeset_lock.c >> > b/drivers/gpu/drm/drm_modeset_lock.c >> > index 4d32b61fa1fd..ee36dd20900d 100644 >> > --- a/drivers/gpu/drm/drm_modeset_lock.c >> > +++ b/drivers/gpu/drm/drm_modeset_lock.c >> > @@ -79,7 +79,7 @@ >> > static DEFINE_WW_CLASS(crtc_ww_class); >> > >> > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK) >> > -static noinline depot_stack_handle_t __stack_depot_save(void) >> > +static noinline depot_stack_handle_t __drm_stack_depot_save(void) >> > { >> >unsigned long entries[8]; >> >unsigned int n; >> > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t >> > stack_depot) >> >kfree(buf); >> > } >> > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */ >> > -static depot_stack_handle_t __stack_depot_save(void) >> > +static depot_stack_handle_t __drm_stack_depot_save(void) >> > { >> >return 0; >> > } >> > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock >> > *lock, >> >ret = 0; >> >} else if (ret == -EDEADLK) { >> >ctx->contended = lock; >> > - ctx->stack_depot = __stack_depot_save(); >> > + ctx->stack_depot = __drm_stack_depot_save(); >> >} >> > >> >return ret; >> >> This has reappeared today. I don't know what happened to the drm-misc >> tree over the weeked :-( >> >> I have reapplied the above fix. > > So the above drm-misc commit is now in the drm tree, but its fix up > commit vanished from the drm-misc tree over the past weekend :-( Cc: drm-misc maintainers. We normally point drm-misc/for-linux-next at drm-misc-next, *except* to drm-misc-next-fixes during the merge window. This is because drm-misc-next already starts accumulating stuff that's headed to one release later, e.g. currently v5.17. I think that's part of the reason. I probably should have pushed c4f08d7246a5 ("drm/locking: fix __stack_depot_* name conflict") to drm-misc-next-fixes. There's still something funny going on, because the drm-misc-next pull request [1] isn't part of the drm pull request for v5.16 [2]. Is there going to be another drm pull? BR, Jani. [1] https://lore.kernel.org/r/20211014120452.2wicnt6hobu3kbwb@gilmour [2] https://lore.kernel.org/r/CAPM=9tyOyz4_-OdjDduFkponSXycO6maBDFsWGTLv+j=_vp...@mail.gmail.com -- Jani Nikula, Intel Open Source Graphics Center
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi, On Fri, Nov 05, 2021 at 01:03:43PM +0200, Jani Nikula wrote: > On Fri, 05 Nov 2021, Stephen Rothwell wrote: > > Hi all, > > > > On Mon, 1 Nov 2021 19:42:23 +1100 Stephen Rothwell > > wrote: > >> > >> On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell > >> wrote: > >> > > >> > After merging the drm-misc tree, today's linux-next build (arm > >> > multi_v7_defconfig) failed like this: > >> > > >> > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for > >> > '__stack_depot_save' > >> > 111 | static depot_stack_handle_t __stack_depot_save(void) > >> > | ^~ > >> > In file included from include/linux/page_ext.h:7, > >> > from include/linux/mm.h:25, > >> > from include/linux/kallsyms.h:13, > >> > from include/linux/bpf.h:20, > >> > from include/linux/bpf-cgroup.h:5, > >> > from include/linux/cgroup-defs.h:22, > >> > from include/linux/cgroup.h:28, > >> > from include/linux/memcontrol.h:13, > >> > from include/linux/swap.h:9, > >> > from include/linux/suspend.h:5, > >> > from include/linux/regulator/consumer.h:35, > >> > from include/linux/i2c.h:18, > >> > from include/drm/drm_crtc.h:28, > >> > from include/drm/drm_atomic.h:31, > >> > from drivers/gpu/drm/drm_modeset_lock.c:24: > >> > include/linux/stackdepot.h:18:22: note: previous declaration of > >> > '__stack_depot_save' was here > >> >18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries, > >> > | ^~ > >> > > >> > Caused by commit > >> > > >> > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks > >> > without backoff") > >> > > >> > This may only have been revealed because of another fix I have had to > >> > apply today. > >> > > >> > I have applied the following patch for today. > >> > > >> > From: Stephen Rothwell > >> > Date: Fri, 15 Oct 2021 20:17:52 +1100 > >> > Subject: [PATCH] drm/locking: fix for name conflict > >> > > >> > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended > >> > locks without backoff") > >> > Signed-off-by: Stephen Rothwell > >> > --- > >> > drivers/gpu/drm/drm_modeset_lock.c | 6 +++--- > >> > 1 file changed, 3 insertions(+), 3 deletions(-) > >> > > >> > diff --git a/drivers/gpu/drm/drm_modeset_lock.c > >> > b/drivers/gpu/drm/drm_modeset_lock.c > >> > index 4d32b61fa1fd..ee36dd20900d 100644 > >> > --- a/drivers/gpu/drm/drm_modeset_lock.c > >> > +++ b/drivers/gpu/drm/drm_modeset_lock.c > >> > @@ -79,7 +79,7 @@ > >> > static DEFINE_WW_CLASS(crtc_ww_class); > >> > > >> > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK) > >> > -static noinline depot_stack_handle_t __stack_depot_save(void) > >> > +static noinline depot_stack_handle_t __drm_stack_depot_save(void) > >> > { > >> > unsigned long entries[8]; > >> > unsigned int n; > >> > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t > >> > stack_depot) > >> > kfree(buf); > >> > } > >> > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */ > >> > -static depot_stack_handle_t __stack_depot_save(void) > >> > +static depot_stack_handle_t __drm_stack_depot_save(void) > >> > { > >> > return 0; > >> > } > >> > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct > >> > drm_modeset_lock *lock, > >> > ret = 0; > >> > } else if (ret == -EDEADLK) { > >> > ctx->contended = lock; > >> > -ctx->stack_depot = __stack_depot_save(); > >> > +ctx->stack_depot = __drm_stack_depot_save(); > >> > } > >> > > >> > return ret; > >> > >> This has reappeared today. I don't know what happened to the drm-misc > >> tree over the weeked :-( > >> > >> I have reapplied the above fix. > > > > So the above drm-misc commit is now in the drm tree, but its fix up > > commit vanished from the drm-misc tree over the past weekend :-( > > Cc: drm-misc maintainers. > > We normally point drm-misc/for-linux-next at drm-misc-next, *except* to > drm-misc-next-fixes during the merge window. This is because > drm-misc-next already starts accumulating stuff that's headed to one > release later, e.g. currently v5.17. I think that's part of the reason. Indeed > I probably should have pushed c4f08d7246a5 ("drm/locking: fix > __stack_depot_* name conflict") to drm-misc-next-fixes. > > There's still something funny going on, because the drm-misc-next pull > request [1] isn't part of the drm pull request for v5.16 [2]. Is there > going to be another drm pull? The last drm-misc-next PR for some reason didn't got logged into patchwork, and Dave missed it. We found out yesterday, and he pulled it today so I assume there will be a second PR with that last
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi Jani, On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula wrote: > > I probably should have pushed c4f08d7246a5 ("drm/locking: fix > __stack_depot_* name conflict") to drm-misc-next-fixes. Please do so as builds will start failing otherwise :-( -- Cheers, Stephen Rothwell pgpa2iVfhrIzA.pgp Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Sat, 06 Nov 2021, Stephen Rothwell wrote: > Hi Jani, > > On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula wrote: >> >> I probably should have pushed c4f08d7246a5 ("drm/locking: fix >> __stack_depot_* name conflict") to drm-misc-next-fixes. > > Please do so as builds will start failing otherwise :-( Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes? BR, Jani. -- Jani Nikula, Intel Open Source Graphics Center
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Tue, Nov 09, 2021 at 09:40:08AM +0200, Jani Nikula wrote: > On Sat, 06 Nov 2021, Stephen Rothwell wrote: > > Hi Jani, > > > > On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula > > wrote: > >> > >> I probably should have pushed c4f08d7246a5 ("drm/locking: fix > >> __stack_depot_* name conflict") to drm-misc-next-fixes. > > > > Please do so as builds will start failing otherwise :-( > > Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes? Yeah just do, for drm-misc this is considered in committer purview. I think we should add a section to the docs about "What if a patch is in the wrong branch" which tells you to just cherry-pick -x or whatever. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Tue, 09 Nov 2021, Daniel Vetter wrote: > On Tue, Nov 09, 2021 at 09:40:08AM +0200, Jani Nikula wrote: >> On Sat, 06 Nov 2021, Stephen Rothwell wrote: >> > Hi Jani, >> > >> > On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula >> > wrote: >> >> >> >> I probably should have pushed c4f08d7246a5 ("drm/locking: fix >> >> __stack_depot_* name conflict") to drm-misc-next-fixes. >> > >> > Please do so as builds will start failing otherwise :-( >> >> Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes? > > Yeah just do, for drm-misc this is considered in committer purview. I > think we should add a section to the docs about "What if a patch is in the > wrong branch" which tells you to just cherry-pick -x or whatever. Done. BR, Jani. -- Jani Nikula, Intel Open Source Graphics Center