Commit a4a2739b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2020-07-28' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



 * drm: fix possible use-after-free
 * dbi: fix SPI Type 1 transfer
 * drm_fb_helper: use memcpy_io on bochs' sparc64
 * mcde: fix stability
 * panel: fix display noise on auo,kd101n80-45na
 * panel: delay HPD checks for boe_nv133fhm_n61
 * bridge: drop connector check in nwl-dsi bridge
 * bridge: set proper bridge type for adv7511
 * of: fix a double free

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200728110446.GA8076@linux-uq9g
parents 0d786980 8490d6a7

drivers/gpu/drm/bochs/bochs_kms.c

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ int bochs_kms_init(struct bochs_device *bochs) 
	bochs->dev->mode_config.preferred_depth = 24;

	bochs->dev->mode_config.prefer_shadow = 0;

	bochs->dev->mode_config.prefer_shadow_fbdev = 1;

	bochs->dev->mode_config.fbdev_use_iomem = true;

	bochs->dev->mode_config.quirk_addfb_prefer_host_byte_order = true;



	bochs->dev->mode_config.funcs = &bochs_mode_funcs;

drivers/gpu/drm/bridge/adv7511/adv7511_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -1224,6 +1224,7 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id) 


	adv7511->bridge.funcs = &adv7511_bridge_funcs;

	adv7511->bridge.of_node = dev->of_node;

	adv7511->bridge.type = DRM_MODE_CONNECTOR_HDMIA;



	drm_bridge_add(&adv7511->bridge);

drivers/gpu/drm/bridge/nwl-dsi.c

+0 −5
Original line number Diff line number Diff line
@@ -917,11 +917,6 @@ static int nwl_dsi_bridge_attach(struct drm_bridge *bridge, 
	struct drm_panel *panel;

	int ret;



	if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) {

		DRM_ERROR("Fix bridge driver to make connector optional!");

		return -EINVAL;

	}



	ret = drm_of_find_panel_or_bridge(dsi->dev->of_node, 1, 0, &panel,

					  &panel_bridge);

	if (ret)

drivers/gpu/drm/drm_fb_helper.c

+5 −1
Original line number Diff line number Diff line
@@ -399,7 +399,11 @@ static void drm_fb_helper_dirty_blit_real(struct drm_fb_helper *fb_helper, 
	unsigned int y;



	for (y = clip->y1; y < clip->y2; y++) {

		if (!fb_helper->dev->mode_config.fbdev_use_iomem)

			memcpy(dst, src, len);

		else

			memcpy_toio((void __iomem *)dst, src, len);



		src += fb->pitches[0];

		dst += fb->pitches[0];

	}

drivers/gpu/drm/drm_gem.c

+4 −6
Original line number Diff line number Diff line
@@ -871,9 +871,6 @@ err: 
 * @file_priv: drm file-private structure

 *

 * Open an object using the global name, returning a handle and the size.

 *

 * This handle (of course) holds a reference to the object, so the object

 * will not go away until the handle is deleted.

 */

int

drm_gem_open_ioctl(struct drm_device *dev, void *data,
@@ -898,14 +895,15 @@ drm_gem_open_ioctl(struct drm_device *dev, void *data, 


	/* drm_gem_handle_create_tail unlocks dev->object_name_lock. */

	ret = drm_gem_handle_create_tail(file_priv, obj, &handle);

	drm_gem_object_put_unlocked(obj);

	if (ret)

		return ret;

		goto err;



	args->handle = handle;

	args->size = obj->size;



	return 0;

err:

	drm_gem_object_put_unlocked(obj);

	return ret;

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE