Unverified Commit 11dcda9b authored by Maxime Ripard's avatar Maxime Ripard
Browse files

Merge drm-misc/drm-misc-next-fixes into drm-misc-fixes 



There's a patch left in drm-misc-next-fixes, let's bring it into
drm-misc-fixes.

Signed-off-by: default avatarMaxime Ripard <mripard@kernel.org>
parents a1ff5a7d 291e4baf

tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c

+3 −1
Original line number Diff line number Diff line
@@ -29,9 +29,11 @@ static int check_vgem(int fd) 
	version.name = name;



	ret = ioctl(fd, DRM_IOCTL_VERSION, &version);

	if (ret)

	if (ret || version.name_len != 4)

		return 0;



	name[4] = '\0';



	return !strcmp(name, "vgem");

}