Commit 3d3921d1 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2023-02-28' of... 

Merge tag 'drm-misc-next-fixes-2023-02-28' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-next

Short summary of fixes pull:

Fixes uninitialized variables in fbdev error paths and reverts an
SHMEM-helper symbol back to being exported as GPL.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/Y/3Fw1HjgPcplo+j@linux-uq9g
parents a48bba98 047a7545

drivers/gpu/drm/drm_gem_shmem_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *shmem) 


	return sgt;

}

EXPORT_SYMBOL(drm_gem_shmem_get_pages_sgt);

EXPORT_SYMBOL_GPL(drm_gem_shmem_get_pages_sgt);



/**

 * drm_gem_shmem_prime_import_sg_table - Produce a shmem GEM object from

drivers/gpu/drm/msm/msm_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static const struct drm_fb_helper_funcs msm_fb_helper_funcs = { 
struct drm_fb_helper *msm_fbdev_init(struct drm_device *dev)

{

	struct msm_drm_private *priv = dev->dev_private;

	struct msm_fbdev *fbdev = NULL;

	struct msm_fbdev *fbdev;

	struct drm_fb_helper *helper;

	int ret;

drivers/gpu/drm/omapdrm/omap_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ void omap_fbdev_init(struct drm_device *dev) 


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

	if (!fbdev)

		goto fail;

		return;



	INIT_WORK(&fbdev->work, pan_worker);