Skip to contentSkip to conversation

Broken build due to 6aed8ec "drm: review locking for drm_fb_helper_restore_fbdev_mode"

DISCUSSION Stephen Warren 3 participants 3 messages Feb 19, 2013 1 message not in the archive

Subsystems (2)
Linux-next tree Tegra architecture support
lore
Share & tools
lore

Stephen Warren

author
#0 lore raw

Daniel,

Commit 6aed8ec "drm: review locking for drm_fb_helper_restore_fbdev_mode" (now in next-20130218 and later) causes build failures for tegra_defconfig. The issue is this part of the patch:

Quoted 5 lines
drivers/gpu/drm/drm_fb_cma_helper.c +0 -0
index 3742bc9..1b6ba2d 100644

drivers/gpu/drm/drm_fb_cma_helper.c EXPORT_SYMBOL_GPL(drm_fbdev_cma_fini); · line 397

Quoted 9 lines
drivers/gpu/drm/drm_fb_cma_helper.c +2 -0
@@ -389,8 +389,10 @@ EXPORT_SYMBOL_GPL(drm_fbdev_cma_fini);
  */
 void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma)
 {
+       drm_modeset_lock_all(dev);
        if (fbdev_cma)
                drm_fb_helper_restore_fbdev_mode(&fbdev_cma->fb_helper);
+       drm_modeset_unlock_all(dev);
 }
 EXPORT_SYMBOL_GPL(drm_fbdev_cma_restore_mode);

There, there is no "dev" variable, so compile fails.

If I revert this one patch, the build succeeds, although I didn't check whether DRM still works after that (e.g. due to any dependencies from the rest of the series).

#1 lore raw
Quoted 6 lines · Stephen Warren

Daniel,

Commit 6aed8ec "drm: review locking for drm_fb_helper_restore_fbdev_mode" (now in next-20130218 and later) causes build failures for tegra_defconfig. The issue is this part of the patch:

You need to yell at Dave Airlie:

https://patchwork.kernel.org/patch/2162391/

Cheers, Daniel

Quoted 20 lines
Quoted 5 lines
drivers/gpu/drm/drm_fb_cma_helper.c +0 -0
index 3742bc9..1b6ba2d 100644

drivers/gpu/drm/drm_fb_cma_helper.c EXPORT_SYMBOL_GPL(drm_fbdev_cma_fini); · line 397

Quoted 9 lines
drivers/gpu/drm/drm_fb_cma_helper.c +2 -0
@@ -389,8 +389,10 @@ EXPORT_SYMBOL_GPL(drm_fbdev_cma_fini);
  */
 void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma)
 {
+       drm_modeset_lock_all(dev);
        if (fbdev_cma)
                drm_fb_helper_restore_fbdev_mode(&fbdev_cma->fb_helper);
+       drm_modeset_unlock_all(dev);
 }
 EXPORT_SYMBOL_GPL(drm_fbdev_cma_restore_mode);

There, there is no "dev" variable, so compile fails.

If I revert this one patch, the build succeeds, although I didn't check whether DRM still works after that (e.g. due to any dependencies from the rest of the series).

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

A message that is not in the archive (sent off-list or not yet received): CAKMK7uG=x4ESF_uVUwvK+0kzvsXEgZBtM9Z6_Qrm6keSasoCbA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#3 lore raw
Quoted 11 lines · Daniel Vetter
Quoted 6 lines · Stephen Warren

Daniel,

Commit 6aed8ec "drm: review locking for drm_fb_helper_restore_fbdev_mode" (now in next-20130218 and later) causes build failures for tegra_defconfig. The issue is this part of the patch:

You need to yell at Dave Airlie:

https://patchwork.kernel.org/patch/2162391/

Ah, thanks, that solves it.

I guess that was too new for Google to find, and I'm not on dri-devel so it wasn't in my mailbox.