Commit 57778075 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/fb-helper: don't preserve fb_ops across deferred IO use 



Deferred IO now preserves the fb_ops.

v2: Remove the no-op vfree, drop a local var  (Noralf)

Cc: Noralf Trønnes <noralf@tronnes.org>
Cc: dri-devel@lists.freedesktop.org
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1eae0b23d4724d5702b886b6a061ec8219eb9284.1575022735.git.jani.nikula@intel.com
parent 12281c8d

drivers/gpu/drm/drm_fb_helper.c

+3 −22
Original line number Diff line number Diff line
@@ -1954,7 +1954,6 @@ static int drm_fbdev_fb_release(struct fb_info *info, int user) 
static void drm_fbdev_cleanup(struct drm_fb_helper *fb_helper)

{

	struct fb_info *fbi = fb_helper->fbdev;

	struct fb_ops *fbops = NULL;

	void *shadow = NULL;



	if (!fb_helper->dev)
@@ -1963,15 +1962,11 @@ static void drm_fbdev_cleanup(struct drm_fb_helper *fb_helper) 
	if (fbi && fbi->fbdefio) {

		fb_deferred_io_cleanup(fbi);

		shadow = fbi->screen_buffer;

		fbops = fbi->fbops;

	}



	drm_fb_helper_fini(fb_helper);



	if (shadow) {

	vfree(shadow);

		kfree(fbops);

	}



	drm_client_framebuffer_delete(fb_helper->buffer);

}
@@ -2062,24 +2057,10 @@ static int drm_fb_helper_generic_probe(struct drm_fb_helper *fb_helper, 
	drm_fb_helper_fill_info(fbi, fb_helper, sizes);



	if (drm_fbdev_use_shadow_fb(fb_helper)) {

		struct fb_ops *fbops;

		void *shadow;



		/*

		 * fb_deferred_io_cleanup() clears &fbops->fb_mmap so a per

		 * instance version is necessary.

		 */

		fbops = kzalloc(sizeof(*fbops), GFP_KERNEL);

		shadow = vzalloc(fbi->screen_size);

		if (!fbops || !shadow) {

			kfree(fbops);

			vfree(shadow);

		fbi->screen_buffer = vzalloc(fbi->screen_size);

		if (!fbi->screen_buffer)

			return -ENOMEM;

		}



		*fbops = *fbi->fbops;

		fbi->fbops = fbops;

		fbi->screen_buffer = shadow;

		fbi->fbdefio = &drm_fbdev_defio;



		fb_deferred_io_init(fbi);

CRA Git | Maintained and supported by SUSTech CRA and CCSE