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

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

Merge tag 'drm-misc-fixes-2018-04-25' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 

sun41: Fix regression for TBSA711 tablet (Ondrej)
qxl: 2 bug fixes (Gerd)
core: Don't use stale display info between HDMI hotplugs (Ville)
virtio: Fix guest spinning when request queue is full (Gerd)

Cc: Ondrej Jirman <megous@megous.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>

* tag 'drm-misc-fixes-2018-04-25' of git://anongit.freedesktop.org/drm/drm-misc:
  drm/edid: Reset more of the display info
  drm/virtio: fix vq wait_event condition
  qxl: keep separate release_bo pointer
  qxl: fix qxl_release_{map,unmap}
  Revert "drm/sun4i: add lvds mode_valid function"
parents 14cdea89 1f6b8eef

drivers/gpu/drm/drm_edid.c

+3 −8
Original line number Diff line number Diff line
@@ -4451,6 +4451,7 @@ drm_reset_display_info(struct drm_connector *connector) 
	info->max_tmds_clock = 0;

	info->dvi_dual = false;

	info->has_hdmi_infoframe = false;

	memset(&info->hdmi, 0, sizeof(info->hdmi));



	info->non_desktop = 0;

}
@@ -4462,17 +4463,11 @@ u32 drm_add_display_info(struct drm_connector *connector, const struct edid *edi 


	u32 quirks = edid_get_quirks(edid);



	drm_reset_display_info(connector);



	info->width_mm = edid->width_cm * 10;

	info->height_mm = edid->height_cm * 10;



	/* driver figures it out in this case */

	info->bpc = 0;

	info->color_formats = 0;

	info->cea_rev = 0;

	info->max_tmds_clock = 0;

	info->dvi_dual = false;

	info->has_hdmi_infoframe = false;



	info->non_desktop = !!(quirks & EDID_QUIRK_NON_DESKTOP);



	DRM_DEBUG_KMS("non_desktop set to %d\n", info->non_desktop);

drivers/gpu/drm/qxl/qxl_cmd.c

+2 −4
Original line number Diff line number Diff line
@@ -179,10 +179,9 @@ qxl_push_command_ring_release(struct qxl_device *qdev, struct qxl_release *relea 
			      uint32_t type, bool interruptible)

{

	struct qxl_command cmd;

	struct qxl_bo_list *entry = list_first_entry(&release->bos, struct qxl_bo_list, tv.head);



	cmd.type = type;

	cmd.data = qxl_bo_physical_address(qdev, to_qxl_bo(entry->tv.bo), release->release_offset);

	cmd.data = qxl_bo_physical_address(qdev, release->release_bo, release->release_offset);



	return qxl_ring_push(qdev->command_ring, &cmd, interruptible);

}
@@ -192,10 +191,9 @@ qxl_push_cursor_ring_release(struct qxl_device *qdev, struct qxl_release *releas 
			     uint32_t type, bool interruptible)

{

	struct qxl_command cmd;

	struct qxl_bo_list *entry = list_first_entry(&release->bos, struct qxl_bo_list, tv.head);



	cmd.type = type;

	cmd.data = qxl_bo_physical_address(qdev, to_qxl_bo(entry->tv.bo), release->release_offset);

	cmd.data = qxl_bo_physical_address(qdev, release->release_bo, release->release_offset);



	return qxl_ring_push(qdev->cursor_ring, &cmd, interruptible);

}

drivers/gpu/drm/qxl/qxl_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ struct qxl_release { 


	int id;

	int type;

	struct qxl_bo *release_bo;

	uint32_t release_offset;

	uint32_t surface_release_id;

	struct ww_acquire_ctx ticket;

drivers/gpu/drm/qxl/qxl_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -182,9 +182,9 @@ static int qxl_process_single_command(struct qxl_device *qdev, 
		goto out_free_reloc;



	/* TODO copy slow path code from i915 */

	fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));

	fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_MASK));

	unwritten = __copy_from_user_inatomic_nocache

		(fb_cmd + sizeof(union qxl_release_info) + (release->release_offset & ~PAGE_SIZE),

		(fb_cmd + sizeof(union qxl_release_info) + (release->release_offset & ~PAGE_MASK),

		 u64_to_user_ptr(cmd->command), cmd->command_size);



	{

drivers/gpu/drm/qxl/qxl_release.c

+9 −9
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ qxl_release_free_list(struct qxl_release *release) 
		list_del(&entry->tv.head);

		kfree(entry);

	}

	release->release_bo = NULL;

}



void
@@ -296,7 +297,6 @@ int qxl_alloc_surface_release_reserved(struct qxl_device *qdev, 
{

	if (surface_cmd_type == QXL_SURFACE_CMD_DESTROY && create_rel) {

		int idr_ret;

		struct qxl_bo_list *entry = list_first_entry(&create_rel->bos, struct qxl_bo_list, tv.head);

		struct qxl_bo *bo;

		union qxl_release_info *info;
@@ -304,8 +304,9 @@ int qxl_alloc_surface_release_reserved(struct qxl_device *qdev, 
		idr_ret = qxl_release_alloc(qdev, QXL_RELEASE_SURFACE_CMD, release);

		if (idr_ret < 0)

			return idr_ret;

		bo = to_qxl_bo(entry->tv.bo);

		bo = create_rel->release_bo;



		(*release)->release_bo = bo;

		(*release)->release_offset = create_rel->release_offset + 64;



		qxl_release_list_add(*release, bo);
@@ -365,6 +366,7 @@ int qxl_alloc_release_reserved(struct qxl_device *qdev, unsigned long size, 


	bo = qxl_bo_ref(qdev->current_release_bo[cur_idx]);



	(*release)->release_bo = bo;

	(*release)->release_offset = qdev->current_release_bo_offset[cur_idx] * release_size_per_bo[cur_idx];

	qdev->current_release_bo_offset[cur_idx]++;
@@ -408,13 +410,12 @@ union qxl_release_info *qxl_release_map(struct qxl_device *qdev, 
{

	void *ptr;

	union qxl_release_info *info;

	struct qxl_bo_list *entry = list_first_entry(&release->bos, struct qxl_bo_list, tv.head);

	struct qxl_bo *bo = to_qxl_bo(entry->tv.bo);

	struct qxl_bo *bo = release->release_bo;



	ptr = qxl_bo_kmap_atomic_page(qdev, bo, release->release_offset & PAGE_SIZE);

	ptr = qxl_bo_kmap_atomic_page(qdev, bo, release->release_offset & PAGE_MASK);

	if (!ptr)

		return NULL;

	info = ptr + (release->release_offset & ~PAGE_SIZE);

	info = ptr + (release->release_offset & ~PAGE_MASK);

	return info;

}
@@ -422,11 +423,10 @@ void qxl_release_unmap(struct qxl_device *qdev, 
		       struct qxl_release *release,

		       union qxl_release_info *info)

{

	struct qxl_bo_list *entry = list_first_entry(&release->bos, struct qxl_bo_list, tv.head);

	struct qxl_bo *bo = to_qxl_bo(entry->tv.bo);

	struct qxl_bo *bo = release->release_bo;

	void *ptr;



	ptr = ((void *)info) - (release->release_offset & ~PAGE_SIZE);

	ptr = ((void *)info) - (release->release_offset & ~PAGE_MASK);

	qxl_bo_kunmap_atomic_page(qdev, bo, ptr);

}