Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c96895e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert "fb: Initialize fb_info mutexes in framebuffer_alloc()" 



This reverts commit 4148df9b.

Let's hope that the mm_lock initialization is now correct with all
drivers, following Krzysztof's patches.

Requested-by: default avatarKrzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 99f5d48b

drivers/video/fbmem.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1513,6 +1513,8 @@ register_framebuffer(struct fb_info *fb_info) 
		if (!registered_fb[i])

		if (!registered_fb[i])

			break;

			break;

	fb_info->node = i;

	fb_info->node = i;

	mutex_init(&fb_info->lock);

	mutex_init(&fb_info->mm_lock);





	fb_info->dev = device_create(fb_class, fb_info->device,

	fb_info->dev = device_create(fb_class, fb_info->device,

				     MKDEV(FB_MAJOR, i), NULL, "fb%d", i);

				     MKDEV(FB_MAJOR, i), NULL, "fb%d", i);

drivers/video/fbsysfs.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -62,9 +62,6 @@ struct fb_info *framebuffer_alloc(size_t size, struct device *dev) 
	mutex_init(&info->bl_curve_mutex);

	mutex_init(&info->bl_curve_mutex);

#endif

#endif





	mutex_init(&info->lock);

	mutex_init(&info->mm_lock);



	return info;

	return info;

#undef PADDING

#undef PADDING

#undef BYTES_PER_LONG

#undef BYTES_PER_LONG

drivers/video/matrox/matroxfb_base.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -2082,7 +2082,6 @@ static int matroxfb_probe(struct pci_dev* pdev, const struct pci_device_id* dumm 
	spin_lock_init(&ACCESS_FBINFO(lock.accel));

	spin_lock_init(&ACCESS_FBINFO(lock.accel));

	init_rwsem(&ACCESS_FBINFO(crtc2.lock));

	init_rwsem(&ACCESS_FBINFO(crtc2.lock));

	init_rwsem(&ACCESS_FBINFO(altout.lock));

	init_rwsem(&ACCESS_FBINFO(altout.lock));

	mutex_init(&ACCESS_FBINFO(fbcon).lock);

	mutex_init(&ACCESS_FBINFO(fbcon).mm_lock);

	mutex_init(&ACCESS_FBINFO(fbcon).mm_lock);

	ACCESS_FBINFO(irq_flags) = 0;

	ACCESS_FBINFO(irq_flags) = 0;

	init_waitqueue_head(&ACCESS_FBINFO(crtc1.vsync.wait));

	init_waitqueue_head(&ACCESS_FBINFO(crtc1.vsync.wait));

drivers/video/sm501fb.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1624,6 +1624,8 @@ static int __devinit sm501fb_start_one(struct sm501fb_info *info, 
	if (!fbi)

	if (!fbi)

		return 0;

		return 0;





	mutex_init(&info->fb[head]->mm_lock);



	ret = sm501fb_init_fb(info->fb[head], head, drvname);

	ret = sm501fb_init_fb(info->fb[head], head, drvname);

	if (ret) {

	if (ret) {

		dev_err(info->dev, "cannot initialise fb %s\n", drvname);

		dev_err(info->dev, "cannot initialise fb %s\n", drvname);