Hi all,

On Wed, 26 Aug 2020 10:55:47 +1000 Stephen Rothwell sfr@canb.auug.org.au wrote:

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 sfr@canb.auug.org.au Date: Wed, 26 Aug 2020 10:40:18 +1000 Subject: [PATCH] fix interaction with drm-misc-fix commit

Signed-off-by: Stephen Rothwell sfr@canb.auug.org.au

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 <linux/crc32.h> #include <linux/delay.h>

+#include <drm/drm_drv.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_gem_framebuffer_helper.h> @@ -186,7 +187,7 @@ void qxl_display_read_client_monitors_config(struct qxl_device *qdev)

DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret); qxl_update_offset_props(qdev);

• DRM_MODESET_LOCK_ALL_END(ctx, ret);

• DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); if (!drm_helper_hpd_irq_event(dev)) { /* notify that the monitor configuration changed, to adjust at the arbitrary resolution */

@@ -431,7 +432,7 @@ static int qxl_framebuffer_surface_dirty(struct drm_framebuffer *fb, clips, num_clips, inc, 0);

out_lock_end:

• DRM_MODESET_LOCK_ALL_END(ctx, ret);

• DRM_MODESET_LOCK_ALL_END(fb->dev, ctx, ret);

  return 0;

}

2.28.0

This is now a build failure in the drm tree merg. I have added the above hack to the merge of the drm tree today.