Commit 396db75a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2026-05-15' of... 

Merge tag 'drm-misc-fixes-2026-05-15' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-fixes

Short summary of fixes pull:

bridge:
- imx8qxp-pxl2dpi: avoid ERR_PTR with device_node cleanup

gma500:
- oaktrail_lvds: fix i2c handling

loongson:
- use managed cleanup for connector polling

panfrost:
- handle results from reservation locking correctly

qaic:
- check for integer overflows in mmap logic

rocket:
- handle results from reservation locking correctly

ttm:
- avoid infinite loop in swap out
- avoid infinite loop in BO shrinking
- convert -EAGAIN from dmem_cgroup_try_charge to -ENOSPC

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patch.msgid.link/20260515070816.GA88575@2a02-2455-9062-2500-7dec-552d-233d-9fe0.dyn6.pyur.net
parents 96f34d18 0a9c56dd

drivers/accel/qaic/qaic_data.c

+21 −2
Original line number Diff line number Diff line
@@ -606,8 +606,11 @@ static const struct vm_operations_struct drm_vm_ops = { 
static int qaic_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)

{

	struct qaic_bo *bo = to_qaic_bo(obj);

	unsigned long remap_start;

	unsigned long offset = 0;

	unsigned long remap_end;

	struct scatterlist *sg;

	unsigned long length;

	int ret = 0;



	if (drm_gem_is_imported(obj))
@@ -615,11 +618,27 @@ static int qaic_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_struc 


	for (sg = bo->sgt->sgl; sg; sg = sg_next(sg)) {

		if (sg_page(sg)) {

			/* if sg is too large for the VMA, so truncate it to fit */

			if (check_add_overflow(vma->vm_start, offset, &remap_start))

				return -EINVAL;

			if (check_add_overflow(remap_start, sg->length, &remap_end))

				return -EINVAL;



			if (remap_end > vma->vm_end) {

				if (check_sub_overflow(vma->vm_end, remap_start, &length))

					return -EINVAL;

			} else {

				length = sg->length;

			}



			if (length == 0)

				goto out;



			ret = remap_pfn_range(vma, vma->vm_start + offset, page_to_pfn(sg_page(sg)),

					      sg->length, vma->vm_page_prot);

					      length, vma->vm_page_prot);

			if (ret)

				goto out;

			offset += sg->length;

			offset += length;

		}

	}

drivers/accel/rocket/rocket_gem.c

+2 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ int rocket_ioctl_prep_bo(struct drm_device *dev, void *data, struct drm_file *fi 
	ret = dma_resv_wait_timeout(gem_obj->resv, DMA_RESV_USAGE_WRITE, true, timeout);

	if (!ret)

		ret = timeout ? -ETIMEDOUT : -EBUSY;

	else if (ret > 0)

		ret = 0;



	shmem_obj = &to_rocket_bo(gem_obj)->base;

drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c

+23 −17
Original line number Diff line number Diff line
@@ -222,52 +222,58 @@ static const struct drm_bridge_funcs imx8qxp_pxl2dpi_bridge_funcs = { 
			imx8qxp_pxl2dpi_bridge_atomic_get_output_bus_fmts,

};



static struct device_node *

static int

imx8qxp_pxl2dpi_get_available_ep_from_port(struct imx8qxp_pxl2dpi *p2d,

					   u32 port_id)

					   u32 port_id,

					   struct device_node **ep)

{

	struct device_node *port, *ep;

	struct device_node *port;

	int ret = 0;

	int ep_cnt;



	*ep = NULL;



	port = of_graph_get_port_by_id(p2d->dev->of_node, port_id);

	if (!port) {

		DRM_DEV_ERROR(p2d->dev, "failed to get port@%u\n", port_id);

		return ERR_PTR(-ENODEV);

		return -ENODEV;

	}



	ep_cnt = of_get_available_child_count(port);

	if (ep_cnt == 0) {

		DRM_DEV_ERROR(p2d->dev, "no available endpoints of port@%u\n",

			      port_id);

		ep = ERR_PTR(-ENODEV);

		ret = -ENODEV;

		goto out;

	} else if (ep_cnt > 1) {

		DRM_DEV_ERROR(p2d->dev,

			      "invalid available endpoints of port@%u\n",

			      port_id);

		ep = ERR_PTR(-EINVAL);

		ret = -EINVAL;

		goto out;

	}



	ep = of_get_next_available_child(port, NULL);

	if (!ep) {

	*ep = of_get_next_available_child(port, NULL);

	if (!*ep) {

		DRM_DEV_ERROR(p2d->dev,

			      "failed to get available endpoint of port@%u\n",

			      port_id);

		ep = ERR_PTR(-ENODEV);

		ret = -ENODEV;

		goto out;

	}

out:

	of_node_put(port);

	return ep;

	return ret;

}



static int imx8qxp_pxl2dpi_find_next_bridge(struct imx8qxp_pxl2dpi *p2d)

{

	struct device_node *ep __free(device_node) =

		imx8qxp_pxl2dpi_get_available_ep_from_port(p2d, 1);

	if (IS_ERR(ep))

		return PTR_ERR(ep);

	struct device_node *ep __free(device_node) = NULL;

	int ret;



	ret = imx8qxp_pxl2dpi_get_available_ep_from_port(p2d, 1, &ep);

	if (ret)

		return ret;



	struct device_node *remote __free(device_node) = of_graph_get_remote_port_parent(ep);

	if (!remote || !of_device_is_available(remote)) {
@@ -291,9 +297,9 @@ static int imx8qxp_pxl2dpi_set_pixel_link_sel(struct imx8qxp_pxl2dpi *p2d) 
	struct of_endpoint endpoint;

	int ret;



	ep = imx8qxp_pxl2dpi_get_available_ep_from_port(p2d, 0);

	if (IS_ERR(ep))

		return PTR_ERR(ep);

	ret = imx8qxp_pxl2dpi_get_available_ep_from_port(p2d, 0, &ep);

	if (ret)

		return ret;



	ret = of_graph_parse_endpoint(ep, &endpoint);

	if (ret) {

drivers/gpu/drm/gma500/oaktrail_hdmi.c

+1 −0
Original line number Diff line number Diff line
@@ -580,6 +580,7 @@ static int oaktrail_hdmi_get_modes(struct drm_connector *connector) 
	} else {

		edid = (struct edid *)raw_edid;

		/* FIXME ? edid = drm_get_edid(connector, i2c_adap); */

		i2c_put_adapter(i2c_adap);

	}



	if (edid) {

drivers/gpu/drm/gma500/oaktrail_lvds.c

+7 −2
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ void oaktrail_lvds_init(struct drm_device *dev, 
{

	struct gma_encoder *gma_encoder;

	struct gma_connector *gma_connector;

	struct gma_i2c_chan *ddc_bus;

	struct gma_i2c_chan *ddc_bus = NULL;

	struct drm_connector *connector;

	struct drm_encoder *encoder;

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);
@@ -367,6 +367,8 @@ void oaktrail_lvds_init(struct drm_device *dev, 
	if (edid == NULL && dev_priv->lpc_gpio_base) {

		ddc_bus = oaktrail_lvds_i2c_init(dev);

		if (!IS_ERR(ddc_bus)) {

			if (i2c_adap)

				i2c_put_adapter(i2c_adap);

			i2c_adap = &ddc_bus->base;

			edid = drm_get_edid(connector, i2c_adap);

		}
@@ -421,7 +423,10 @@ void oaktrail_lvds_init(struct drm_device *dev, 


err_unlock:

	mutex_unlock(&dev->mode_config.mutex);

	gma_i2c_destroy(to_gma_i2c_chan(connector->ddc));

	if (!IS_ERR_OR_NULL(ddc_bus))

		gma_i2c_destroy(ddc_bus);

	else if (i2c_adap)

		i2c_put_adapter(i2c_adap);

	drm_encoder_cleanup(encoder);

err_connector_cleanup:

	drm_connector_cleanup(connector);