Commit 5502d1fa authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2023-05-24' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



drm-misc-fixes for v6.4-rc4:
- A few non-trivial fixes to qaic.
- Fix drmm_mutex_init always using same lock class.
- Fix pl111 fb depth.
- Fix uninitialised gamma lut in mgag200.
- Add Aya Neo Air Plus quirk.
- Trivial null check removal in scheduler.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/d19f748c-2c5b-8140-5b05-a8282dfef73e@linux.intel.com
parents 13aa38f8 e997c218

drivers/accel/qaic/qaic_control.c

+25 −16
Original line number Diff line number Diff line
@@ -997,14 +997,34 @@ static void *msg_xfer(struct qaic_device *qdev, struct wrapper_list *wrappers, u 
	struct xfer_queue_elem elem;

	struct wire_msg *out_buf;

	struct wrapper_msg *w;

	long ret = -EAGAIN;

	int xfer_count = 0;

	int retry_count;

	long ret;



	if (qdev->in_reset) {

		mutex_unlock(&qdev->cntl_mutex);

		return ERR_PTR(-ENODEV);

	}



	/* Attempt to avoid a partial commit of a message */

	list_for_each_entry(w, &wrappers->list, list)

		xfer_count++;



	for (retry_count = 0; retry_count < QAIC_MHI_RETRY_MAX; retry_count++) {

		if (xfer_count <= mhi_get_free_desc_count(qdev->cntl_ch, DMA_TO_DEVICE)) {

			ret = 0;

			break;

		}

		msleep_interruptible(QAIC_MHI_RETRY_WAIT_MS);

		if (signal_pending(current))

			break;

	}



	if (ret) {

		mutex_unlock(&qdev->cntl_mutex);

		return ERR_PTR(ret);

	}



	elem.seq_num = seq_num;

	elem.buf = NULL;

	init_completion(&elem.xfer_done);
@@ -1038,16 +1058,9 @@ static void *msg_xfer(struct qaic_device *qdev, struct wrapper_list *wrappers, u 
	list_for_each_entry(w, &wrappers->list, list) {

		kref_get(&w->ref_count);

		retry_count = 0;

retry:

		ret = mhi_queue_buf(qdev->cntl_ch, DMA_TO_DEVICE, &w->msg, w->len,

				    list_is_last(&w->list, &wrappers->list) ? MHI_EOT : MHI_CHAIN);

		if (ret) {

			if (ret == -EAGAIN && retry_count++ < QAIC_MHI_RETRY_MAX) {

				msleep_interruptible(QAIC_MHI_RETRY_WAIT_MS);

				if (!signal_pending(current))

					goto retry;

			}



			qdev->cntl_lost_buf = true;

			kref_put(&w->ref_count, free_wrapper);

			mutex_unlock(&qdev->cntl_mutex);
@@ -1249,7 +1262,7 @@ static int qaic_manage(struct qaic_device *qdev, struct qaic_user *usr, struct m 


int qaic_manage_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv)

{

	struct qaic_manage_msg *user_msg;

	struct qaic_manage_msg *user_msg = data;

	struct qaic_device *qdev;

	struct manage_msg *msg;

	struct qaic_user *usr;
@@ -1258,6 +1271,9 @@ int qaic_manage_ioctl(struct drm_device *dev, void *data, struct drm_file *file_ 
	int usr_rcu_id;

	int ret;



	if (user_msg->len > QAIC_MANAGE_MAX_MSG_LENGTH)

		return -EINVAL;



	usr = file_priv->driver_priv;



	usr_rcu_id = srcu_read_lock(&usr->qddev_lock);
@@ -1275,13 +1291,6 @@ int qaic_manage_ioctl(struct drm_device *dev, void *data, struct drm_file *file_ 
		return -ENODEV;

	}



	user_msg = data;



	if (user_msg->len > QAIC_MANAGE_MAX_MSG_LENGTH) {

		ret = -EINVAL;

		goto out;

	}



	msg = kzalloc(QAIC_MANAGE_MAX_MSG_LENGTH + sizeof(*msg), GFP_KERNEL);

	if (!msg) {

		ret = -ENOMEM;

drivers/accel/qaic/qaic_data.c

+46 −47
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ static int qaic_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_struc 
	struct qaic_bo *bo = to_qaic_bo(obj);

	unsigned long offset = 0;

	struct scatterlist *sg;

	int ret;

	int ret = 0;



	if (obj->import_attach)

		return -EINVAL;
@@ -663,6 +663,10 @@ int qaic_create_bo_ioctl(struct drm_device *dev, void *data, struct drm_file *fi 
	if (args->pad)

		return -EINVAL;



	size = PAGE_ALIGN(args->size);

	if (size == 0)

		return -EINVAL;



	usr = file_priv->driver_priv;

	usr_rcu_id = srcu_read_lock(&usr->qddev_lock);

	if (!usr->qddev) {
@@ -677,12 +681,6 @@ int qaic_create_bo_ioctl(struct drm_device *dev, void *data, struct drm_file *fi 
		goto unlock_dev_srcu;

	}



	size = PAGE_ALIGN(args->size);

	if (size == 0) {

		ret = -EINVAL;

		goto unlock_dev_srcu;

	}



	bo = qaic_alloc_init_bo();

	if (IS_ERR(bo)) {

		ret = PTR_ERR(bo);
@@ -926,8 +924,8 @@ int qaic_attach_slice_bo_ioctl(struct drm_device *dev, void *data, struct drm_fi 
{

	struct qaic_attach_slice_entry *slice_ent;

	struct qaic_attach_slice *args = data;

	int rcu_id, usr_rcu_id, qdev_rcu_id;

	struct dma_bridge_chan	*dbc;

	int usr_rcu_id, qdev_rcu_id;

	struct drm_gem_object *obj;

	struct qaic_device *qdev;

	unsigned long arg_size;
@@ -936,6 +934,22 @@ int qaic_attach_slice_bo_ioctl(struct drm_device *dev, void *data, struct drm_fi 
	struct qaic_bo *bo;

	int ret;



	if (args->hdr.count == 0)

		return -EINVAL;



	arg_size = args->hdr.count * sizeof(*slice_ent);

	if (arg_size / args->hdr.count != sizeof(*slice_ent))

		return -EINVAL;



	if (args->hdr.size == 0)

		return -EINVAL;



	if (!(args->hdr.dir == DMA_TO_DEVICE || args->hdr.dir == DMA_FROM_DEVICE))

		return -EINVAL;



	if (args->data == 0)

		return -EINVAL;



	usr = file_priv->driver_priv;

	usr_rcu_id = srcu_read_lock(&usr->qddev_lock);

	if (!usr->qddev) {
@@ -950,43 +964,11 @@ int qaic_attach_slice_bo_ioctl(struct drm_device *dev, void *data, struct drm_fi 
		goto unlock_dev_srcu;

	}



	if (args->hdr.count == 0) {

		ret = -EINVAL;

		goto unlock_dev_srcu;

	}



	arg_size = args->hdr.count * sizeof(*slice_ent);

	if (arg_size / args->hdr.count != sizeof(*slice_ent)) {

		ret = -EINVAL;

		goto unlock_dev_srcu;

	}



	if (args->hdr.dbc_id >= qdev->num_dbc) {

		ret = -EINVAL;

		goto unlock_dev_srcu;

	}



	if (args->hdr.size == 0) {

		ret = -EINVAL;

		goto unlock_dev_srcu;

	}



	if (!(args->hdr.dir == DMA_TO_DEVICE  || args->hdr.dir == DMA_FROM_DEVICE)) {

		ret = -EINVAL;

		goto unlock_dev_srcu;

	}



	dbc = &qdev->dbc[args->hdr.dbc_id];

	if (dbc->usr != usr) {

		ret = -EINVAL;

		goto unlock_dev_srcu;

	}



	if (args->data == 0) {

		ret = -EINVAL;

		goto unlock_dev_srcu;

	}



	user_data = u64_to_user_ptr(args->data);



	slice_ent = kzalloc(arg_size, GFP_KERNEL);
@@ -1013,9 +995,21 @@ int qaic_attach_slice_bo_ioctl(struct drm_device *dev, void *data, struct drm_fi 


	bo = to_qaic_bo(obj);



	if (bo->sliced) {

		ret = -EINVAL;

		goto put_bo;

	}



	dbc = &qdev->dbc[args->hdr.dbc_id];

	rcu_id = srcu_read_lock(&dbc->ch_lock);

	if (dbc->usr != usr) {

		ret = -EINVAL;

		goto unlock_ch_srcu;

	}



	ret = qaic_prepare_bo(qdev, bo, &args->hdr);

	if (ret)

		goto put_bo;

		goto unlock_ch_srcu;



	ret = qaic_attach_slicing_bo(qdev, bo, &args->hdr, slice_ent);

	if (ret)
@@ -1025,6 +1019,7 @@ int qaic_attach_slice_bo_ioctl(struct drm_device *dev, void *data, struct drm_fi 
		dma_sync_sgtable_for_cpu(&qdev->pdev->dev, bo->sgt, args->hdr.dir);



	bo->dbc = dbc;

	srcu_read_unlock(&dbc->ch_lock, rcu_id);

	drm_gem_object_put(obj);

	srcu_read_unlock(&qdev->dev_lock, qdev_rcu_id);

	srcu_read_unlock(&usr->qddev_lock, usr_rcu_id);
@@ -1033,6 +1028,8 @@ int qaic_attach_slice_bo_ioctl(struct drm_device *dev, void *data, struct drm_fi 


unprepare_bo:

	qaic_unprepare_bo(qdev, bo);

unlock_ch_srcu:

	srcu_read_unlock(&dbc->ch_lock, rcu_id);

put_bo:

	drm_gem_object_put(obj);

free_slice_ent:
@@ -1316,7 +1313,6 @@ static int __qaic_execute_bo_ioctl(struct drm_device *dev, void *data, struct dr 
	received_ts = ktime_get_ns();



	size = is_partial ? sizeof(*pexec) : sizeof(*exec);



	n = (unsigned long)size * args->hdr.count;

	if (args->hdr.count == 0 || n / args->hdr.count != size)

		return -EINVAL;
@@ -1665,6 +1661,9 @@ int qaic_wait_bo_ioctl(struct drm_device *dev, void *data, struct drm_file *file 
	int rcu_id;

	int ret;



	if (args->pad != 0)

		return -EINVAL;



	usr = file_priv->driver_priv;

	usr_rcu_id = srcu_read_lock(&usr->qddev_lock);

	if (!usr->qddev) {
@@ -1679,11 +1678,6 @@ int qaic_wait_bo_ioctl(struct drm_device *dev, void *data, struct drm_file *file 
		goto unlock_dev_srcu;

	}



	if (args->pad != 0) {

		ret = -EINVAL;

		goto unlock_dev_srcu;

	}



	if (args->dbc_id >= qdev->num_dbc) {

		ret = -EINVAL;

		goto unlock_dev_srcu;
@@ -1855,6 +1849,11 @@ void wakeup_dbc(struct qaic_device *qdev, u32 dbc_id) 
	dbc->usr = NULL;

	empty_xfer_list(qdev, dbc);

	synchronize_srcu(&dbc->ch_lock);

	/*

	 * Threads holding channel lock, may add more elements in the xfer_list.

	 * Flush out these elements from xfer_list.

	 */

	empty_xfer_list(qdev, dbc);

}



void release_dbc(struct qaic_device *qdev, u32 dbc_id)

drivers/accel/qaic/qaic_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -262,8 +262,8 @@ static void qaic_destroy_drm_device(struct qaic_device *qdev, s32 partition_id) 


static int qaic_mhi_probe(struct mhi_device *mhi_dev, const struct mhi_device_id *id)

{

	u16 major = -1, minor = -1;

	struct qaic_device *qdev;

	u16 major, minor;

	int ret;



	/*

drivers/gpu/drm/drm_managed.c

+2 −20
Original line number Diff line number Diff line
@@ -264,28 +264,10 @@ void drmm_kfree(struct drm_device *dev, void *data) 
}

EXPORT_SYMBOL(drmm_kfree);



static void drmm_mutex_release(struct drm_device *dev, void *res)

void __drmm_mutex_release(struct drm_device *dev, void *res)

{

	struct mutex *lock = res;



	mutex_destroy(lock);

}



/**

 * drmm_mutex_init - &drm_device-managed mutex_init()

 * @dev: DRM device

 * @lock: lock to be initialized

 *

 * Returns:

 * 0 on success, or a negative errno code otherwise.

 *

 * This is a &drm_device-managed version of mutex_init(). The initialized

 * lock is automatically destroyed on the final drm_dev_put().

 */

int drmm_mutex_init(struct drm_device *dev, struct mutex *lock)

{

	mutex_init(lock);



	return drmm_add_action_or_reset(dev, drmm_mutex_release, lock);

}

EXPORT_SYMBOL(drmm_mutex_init);
 
EXPORT_SYMBOL(__drmm_mutex_release);

drivers/gpu/drm/drm_panel_orientation_quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static const struct dmi_system_id orientation_data[] = { 
	}, {	/* AYA NEO AIR */

		.matches = {

		  DMI_EXACT_MATCH(DMI_SYS_VENDOR, "AYANEO"),

		  DMI_MATCH(DMI_BOARD_NAME, "AIR"),

		  DMI_MATCH(DMI_PRODUCT_NAME, "AIR"),

		},

		.driver_data = (void *)&lcd1080x1920_leftside_up,

	}, {	/* AYA NEO NEXT */