Commit c2f3850d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm fixes from Dave Airlie:
 "The nouveau fixes missed the last pull by a few hours, and we had a
  few arm driver/panel/bridge fixes come in.

  This is possibly a bit more than I'm comfortable sending at this
  stage, but I've looked at each patch, the core + nouveau patches fix
  regressions, and the arm related ones are all around screens turning
  on and working, and are mostly trivial patches, the line count is
  mostly in comments.

  core:
   - fix possible use-after-free

  drm_fb_helper:
   - regression fix to use memcpy_io on bochs' sparc64

  nouveau:
   - format modifiers fixes
   - HDA regression fix
   - turing modesetting race fix

  of:
   - fix a double free

  dbi:
   - fix SPI Type 1 transfer

  mcde:
   - fix screen stability crash

  panel:
   - panel: fix display noise on auo,kd101n80-45na
   - panel: delay HPD checks for boe_nv133fhm_n61

  bridge:
   - bridge: drop connector check in nwl-dsi bridge
   - bridge: set proper bridge type for adv7511"

* tag 'drm-fixes-2020-07-29' of git://anongit.freedesktop.org/drm/drm:
  drm: hold gem reference until object is no longer accessed
  drm/dbi: Fix SPI Type 1 (9-bit) transfer
  drm/drm_fb_helper: fix fbdev with sparc64
  drm/mcde: Fix stability issue
  drm/bridge: nwl-dsi: Drop DRM_BRIDGE_ATTACH_NO_CONNECTOR check.
  drm/panel: Fix auo, kd101n80-45na horizontal noise on edges of panel
  drm: panel: simple: Delay HPD checking on boe_nv133fhm_n61 for 15 ms
  drm/bridge/adv7511: set the bridge type properly
  drm: of: Fix double-free bug
  drm/nouveau/fbcon: zero-initialise the mode_cmd2 structure
  drm/nouveau/fbcon: fix module unload when fbcon init has failed for some reason
  drm/nouveau/kms/tu102: wait for core update to complete when assigning windows
  drm/nouveau/kms/gf100: use correct format modifiers
  drm/nouveau/disp/gm200-: fix regression from HDA SOR selection changes
parents f227e3ec a4a2739b

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