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

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



Two fixes for the raspberrypi panel initialisation, one fix for a logic
inversion in radeon, a build and pm refcounting fix for vc4, two reverts
for drm_of_get_bridge that caused a number of regression and a locking
regression for amdgpu.

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220422084403.2xrhf3jusdej5yo4@houat
parents 70da382e 94f4c496

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+15 −6
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ static int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, union drm_amdgpu_cs 
		goto free_chunk;

	}



	mutex_lock(&p->ctx->lock);



	/* skip guilty context job */

	if (atomic_read(&p->ctx->guilty) == 1) {

		ret = -ECANCELED;
@@ -709,6 +711,7 @@ static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser, int error, 
	dma_fence_put(parser->fence);



	if (parser->ctx) {

		mutex_unlock(&parser->ctx->lock);

		amdgpu_ctx_put(parser->ctx);

	}

	if (parser->bo_list)
@@ -1157,6 +1160,9 @@ static int amdgpu_cs_dependencies(struct amdgpu_device *adev, 
{

	int i, r;



	/* TODO: Investigate why we still need the context lock */

	mutex_unlock(&p->ctx->lock);



	for (i = 0; i < p->nchunks; ++i) {

		struct amdgpu_cs_chunk *chunk;
@@ -1167,32 +1173,34 @@ static int amdgpu_cs_dependencies(struct amdgpu_device *adev, 
		case AMDGPU_CHUNK_ID_SCHEDULED_DEPENDENCIES:

			r = amdgpu_cs_process_fence_dep(p, chunk);

			if (r)

				return r;

				goto out;

			break;

		case AMDGPU_CHUNK_ID_SYNCOBJ_IN:

			r = amdgpu_cs_process_syncobj_in_dep(p, chunk);

			if (r)

				return r;

				goto out;

			break;

		case AMDGPU_CHUNK_ID_SYNCOBJ_OUT:

			r = amdgpu_cs_process_syncobj_out_dep(p, chunk);

			if (r)

				return r;

				goto out;

			break;

		case AMDGPU_CHUNK_ID_SYNCOBJ_TIMELINE_WAIT:

			r = amdgpu_cs_process_syncobj_timeline_in_dep(p, chunk);

			if (r)

				return r;

				goto out;

			break;

		case AMDGPU_CHUNK_ID_SYNCOBJ_TIMELINE_SIGNAL:

			r = amdgpu_cs_process_syncobj_timeline_out_dep(p, chunk);

			if (r)

				return r;

				goto out;

			break;

		}

	}



	return 0;

out:

	mutex_lock(&p->ctx->lock);

	return r;

}



static void amdgpu_cs_post_dependencies(struct amdgpu_cs_parser *p)
@@ -1368,6 +1376,7 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
		goto out;



	r = amdgpu_cs_submit(&parser, cs);



out:

	amdgpu_cs_parser_fini(&parser, r, reserved_buffers);

drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c

+2 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ static int amdgpu_ctx_init(struct amdgpu_device *adev, 


	kref_init(&ctx->refcount);

	spin_lock_init(&ctx->ring_lock);

	mutex_init(&ctx->lock);



	ctx->reset_counter = atomic_read(&adev->gpu_reset_counter);

	ctx->reset_counter_query = ctx->reset_counter;
@@ -357,6 +358,7 @@ static void amdgpu_ctx_fini(struct kref *ref) 
		drm_dev_exit(idx);

	}



	mutex_destroy(&ctx->lock);

	kfree(ctx);

}

drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ struct amdgpu_ctx { 
	bool				preamble_presented;

	int32_t				init_priority;

	int32_t				override_priority;

	struct mutex			lock;

	atomic_t			guilty;

	unsigned long			ras_counter_ce;

	unsigned long			ras_counter_ue;

drivers/gpu/drm/drm_of.c

+33 −51
Original line number Diff line number Diff line
@@ -214,29 +214,6 @@ int drm_of_encoder_active_endpoint(struct device_node *node, 
}

EXPORT_SYMBOL_GPL(drm_of_encoder_active_endpoint);



static int find_panel_or_bridge(struct device_node *node,

				struct drm_panel **panel,

				struct drm_bridge **bridge)

{

	if (panel) {

		*panel = of_drm_find_panel(node);

		if (!IS_ERR(*panel))

			return 0;



		/* Clear the panel pointer in case of error. */

		*panel = NULL;

	}



	/* No panel found yet, check for a bridge next. */

	if (bridge) {

		*bridge = of_drm_find_bridge(node);

		if (*bridge)

			return 0;

	}



	return -EPROBE_DEFER;

}



/**

 * drm_of_find_panel_or_bridge - return connected panel or bridge device

 * @np: device tree node containing encoder output ports
@@ -259,44 +236,49 @@ int drm_of_find_panel_or_bridge(const struct device_node *np, 
				struct drm_panel **panel,

				struct drm_bridge **bridge)

{

	struct device_node *node;

	int ret;

	int ret = -EPROBE_DEFER;

	struct device_node *remote;



	if (!panel && !bridge)

		return -EINVAL;



	if (panel)

		*panel = NULL;

	if (bridge)

		*bridge = NULL;



	/* Check for a graph on the device node first. */

	if (of_graph_is_present(np)) {

		node = of_graph_get_remote_node(np, port, endpoint);

		if (node) {

			ret = find_panel_or_bridge(node, panel, bridge);

			of_node_put(node);

	/*

	 * of_graph_get_remote_node() produces a noisy error message if port

	 * node isn't found and the absence of the port is a legit case here,

	 * so at first we silently check whether graph presents in the

	 * device-tree node.

	 */

	if (!of_graph_is_present(np))

		return -ENODEV;



			if (!ret)

				return 0;

		}

	}

	remote = of_graph_get_remote_node(np, port, endpoint);

	if (!remote)

		return -ENODEV;



	/* Otherwise check for any child node other than port/ports. */

	for_each_available_child_of_node(np, node) {

		if (of_node_name_eq(node, "port") ||

		    of_node_name_eq(node, "ports"))

			continue;

	if (panel) {

		*panel = of_drm_find_panel(remote);

		if (!IS_ERR(*panel))

			ret = 0;

		else

			*panel = NULL;

	}



		ret = find_panel_or_bridge(node, panel, bridge);

		of_node_put(node);

	/* No panel found yet, check for a bridge next. */

	if (bridge) {

		if (ret) {

			*bridge = of_drm_find_bridge(remote);

			if (*bridge)

				ret = 0;

		} else {

			*bridge = NULL;

		}



		/* Stop at the first found occurrence. */

		if (!ret)

			return 0;

	}



	return -EPROBE_DEFER;

	of_node_put(remote);

	return ret;

}

EXPORT_SYMBOL_GPL(drm_of_find_panel_or_bridge);

drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c

+10 −3
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static void rpi_touchscreen_i2c_write(struct rpi_touchscreen *ts, 


	ret = i2c_smbus_write_byte_data(ts->i2c, reg, val);

	if (ret)

		dev_err(&ts->dsi->dev, "I2C write failed: %d\n", ret);

		dev_err(&ts->i2c->dev, "I2C write failed: %d\n", ret);

}



static int rpi_touchscreen_write(struct rpi_touchscreen *ts, u16 reg, u32 val)
@@ -265,7 +265,7 @@ static int rpi_touchscreen_noop(struct drm_panel *panel) 
	return 0;

}



static int rpi_touchscreen_enable(struct drm_panel *panel)

static int rpi_touchscreen_prepare(struct drm_panel *panel)

{

	struct rpi_touchscreen *ts = panel_to_ts(panel);

	int i;
@@ -295,6 +295,13 @@ static int rpi_touchscreen_enable(struct drm_panel *panel) 
	rpi_touchscreen_write(ts, DSI_STARTDSI, 0x01);

	msleep(100);



	return 0;

}



static int rpi_touchscreen_enable(struct drm_panel *panel)

{

	struct rpi_touchscreen *ts = panel_to_ts(panel);



	/* Turn on the backlight. */

	rpi_touchscreen_i2c_write(ts, REG_PWM, 255);
@@ -349,7 +356,7 @@ static int rpi_touchscreen_get_modes(struct drm_panel *panel, 
static const struct drm_panel_funcs rpi_touchscreen_funcs = {

	.disable = rpi_touchscreen_disable,

	.unprepare = rpi_touchscreen_noop,

	.prepare = rpi_touchscreen_noop,

	.prepare = rpi_touchscreen_prepare,

	.enable = rpi_touchscreen_enable,

	.get_modes = rpi_touchscreen_get_modes,

};