The drm_vblank_wait() function was renamed to drm_vblank_wait_ioctl() in the DRM tree in commit b6dcaaac4474 ("drm/vblank: _ioctl posfix for ioctl handler"), while the DRM compat code was changed independently in commit d5288c88c67c ("switch compat_drm_wait_vblank() to drm_ioctl_kernel()") to call the old function.
Fix the resulting compilation breakage by calling the correct function.
Fixes: b6dcaaac4474 ("drm/vblank: _ioctl posfix for ioctl handler") Fixes: d5288c88c67c ("switch compat_drm_wait_vblank() to drm_ioctl_kernel()") Signed-off-by: Laurent Pinchart laurent.pinchart+renesas@ideasonboard.com --- drivers/gpu/drm/drm_ioc32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Hello,
This patch fixes a compilation breakage waiting to happen when v4.13-rc1 will be merged back in the drm-misc tree, as b6dcaaac4474 is in drm-misc-next and d5288c88c67c in Linus' master branch.
I suppose that drm-misc-next is not an option, so we can apply this patch on top of the merge, or squash it with the merge commit if we want to avoid breaking bisection.
diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c index 0b2d8c4a2fa5..98c54ad5b433 100644 --- a/drivers/gpu/drm/drm_ioc32.c +++ b/drivers/gpu/drm/drm_ioc32.c @@ -839,7 +839,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;