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

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



A few resources-related fixes for qxl, some doc build warnings and ioctl
fixes for dma-buf, an off-by-one fix in edid, and a return code fix in
DP-MST

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200430153201.wx6of2b2gsoip7bk@gilmour.lan
parents 6a8b55ed 6f49c251

drivers/dma-buf/dma-buf.c

+4 −3
Original line number Diff line number Diff line
@@ -388,7 +388,8 @@ static long dma_buf_ioctl(struct file *file, 


		return ret;



	case DMA_BUF_SET_NAME:

	case DMA_BUF_SET_NAME_A:

	case DMA_BUF_SET_NAME_B:

		return dma_buf_set_name(dmabuf, (const char __user *)arg);



	default:
@@ -655,8 +656,8 @@ EXPORT_SYMBOL_GPL(dma_buf_put); 
 * calls attach() of dma_buf_ops to allow device-specific attach functionality

 * @dmabuf:		[in]	buffer to attach device to.

 * @dev:		[in]	device to be attached.

 * @importer_ops	[in]	importer operations for the attachment

 * @importer_priv	[in]	importer private pointer for the attachment

 * @importer_ops:	[in]	importer operations for the attachment

 * @importer_priv:	[in]	importer private pointer for the attachment

 *

 * Returns struct dma_buf_attachment pointer for this attachment. Attachments

 * must be cleaned up by calling dma_buf_detach().

drivers/gpu/drm/drm_dp_mst_topology.c

+6 −2
Original line number Diff line number Diff line
@@ -3442,8 +3442,12 @@ static int drm_dp_send_dpcd_write(struct drm_dp_mst_topology_mgr *mgr, 
	drm_dp_queue_down_tx(mgr, txmsg);



	ret = drm_dp_mst_wait_tx_reply(mstb, txmsg);

	if (ret > 0 && txmsg->reply.reply_type == DP_SIDEBAND_REPLY_NAK)

	if (ret > 0) {

		if (txmsg->reply.reply_type == DP_SIDEBAND_REPLY_NAK)

			ret = -EIO;

		else

			ret = size;

	}



	kfree(txmsg);

fail_put:

drivers/gpu/drm/drm_edid.c

+1 −1
Original line number Diff line number Diff line
@@ -5111,7 +5111,7 @@ static struct drm_display_mode *drm_mode_displayid_detailed(struct drm_device *d 
	struct drm_display_mode *mode;

	unsigned pixel_clock = (timings->pixel_clock[0] |

				(timings->pixel_clock[1] << 8) |

				(timings->pixel_clock[2] << 16));

				(timings->pixel_clock[2] << 16)) + 1;

	unsigned hactive = (timings->hactive[0] | timings->hactive[1] << 8) + 1;

	unsigned hblank = (timings->hblank[0] | timings->hblank[1] << 8) + 1;

	unsigned hsync = (timings->hsync[0] | (timings->hsync[1] & 0x7f) << 8) + 1;

drivers/gpu/drm/qxl/qxl_cmd.c

+5 −5
Original line number Diff line number Diff line
@@ -480,9 +480,10 @@ int qxl_hw_surface_alloc(struct qxl_device *qdev, 
		return ret;



	ret = qxl_release_reserve_list(release, true);

	if (ret)

	if (ret) {

		qxl_release_free(qdev, release);

		return ret;



	}

	cmd = (struct qxl_surface_cmd *)qxl_release_map(qdev, release);

	cmd->type = QXL_SURFACE_CMD_CREATE;

	cmd->flags = QXL_SURF_FLAG_KEEP_DATA;
@@ -499,8 +500,8 @@ int qxl_hw_surface_alloc(struct qxl_device *qdev, 
	/* no need to add a release to the fence for this surface bo,

	   since it is only released when we ask to destroy the surface

	   and it would never signal otherwise */

	qxl_push_command_ring_release(qdev, release, QXL_CMD_SURFACE, false);

	qxl_release_fence_buffer_objects(release);

	qxl_push_command_ring_release(qdev, release, QXL_CMD_SURFACE, false);



	surf->hw_surf_alloc = true;

	spin_lock(&qdev->surf_id_idr_lock);
@@ -542,9 +543,8 @@ int qxl_hw_surface_dealloc(struct qxl_device *qdev, 
	cmd->surface_id = id;

	qxl_release_unmap(qdev, release, &cmd->release_info);



	qxl_push_command_ring_release(qdev, release, QXL_CMD_SURFACE, false);



	qxl_release_fence_buffer_objects(release);

	qxl_push_command_ring_release(qdev, release, QXL_CMD_SURFACE, false);



	return 0;

}

drivers/gpu/drm/qxl/qxl_display.c

+3 −3
Original line number Diff line number Diff line
@@ -510,8 +510,8 @@ static int qxl_primary_apply_cursor(struct drm_plane *plane) 
	cmd->u.set.visible = 1;

	qxl_release_unmap(qdev, release, &cmd->release_info);



	qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);

	qxl_release_fence_buffer_objects(release);

	qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);



	return ret;
@@ -652,8 +652,8 @@ static void qxl_cursor_atomic_update(struct drm_plane *plane, 
	cmd->u.position.y = plane->state->crtc_y + fb->hot_y;



	qxl_release_unmap(qdev, release, &cmd->release_info);

	qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);

	qxl_release_fence_buffer_objects(release);

	qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);



	if (old_cursor_bo != NULL)

		qxl_bo_unpin(old_cursor_bo);
@@ -700,8 +700,8 @@ static void qxl_cursor_atomic_disable(struct drm_plane *plane, 
	cmd->type = QXL_CURSOR_HIDE;

	qxl_release_unmap(qdev, release, &cmd->release_info);



	qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);

	qxl_release_fence_buffer_objects(release);

	qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);

}



static void qxl_update_dumb_head(struct qxl_device *qdev,

CRA Git | Maintained and supported by SUSTech CRA and CCSE