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

Merge tag 'drm-misc-next-2021-04-09' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for 5.13:

UAPI Changes:

Cross-subsystem Changes:

Core Changes:
  - bridge: Fix Kconfig dependency
  - cmdline: Refuse zero width/height mode
  - ttm: Ignore signaled move fences, ioremap buffer according to mem
         caching settins

Driver Changes:
  - Conversions to sysfs_emit
  - tegra: Don't register DP AUX channels before connectors
  - zynqmp: Fix for an out-of-bound (but within struct padding) memset

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210409090020.jroa2d4p4qansrpa@gilmour
parents 9c0fed84 e8b8b0df

drivers/dma-buf/dma-fence.c

+26 −1
Original line number Diff line number Diff line
@@ -123,7 +123,9 @@ static const struct dma_fence_ops dma_fence_stub_ops = { 
/**

 * dma_fence_get_stub - return a signaled fence

 *

 * Return a stub fence which is already signaled.

 * Return a stub fence which is already signaled. The fence's

 * timestamp corresponds to the first time after boot this

 * function is called.

 */

struct dma_fence *dma_fence_get_stub(void)

{
@@ -141,6 +143,29 @@ struct dma_fence *dma_fence_get_stub(void) 
}

EXPORT_SYMBOL(dma_fence_get_stub);



/**

 * dma_fence_allocate_private_stub - return a private, signaled fence

 *

 * Return a newly allocated and signaled stub fence.

 */

struct dma_fence *dma_fence_allocate_private_stub(void)

{

	struct dma_fence *fence;



	fence = kzalloc(sizeof(*fence), GFP_KERNEL);

	if (fence == NULL)

		return ERR_PTR(-ENOMEM);



	dma_fence_init(fence,

		       &dma_fence_stub_ops,

		       &dma_fence_stub_lock,

		       0, 0);

	dma_fence_signal(fence);



	return fence;

}

EXPORT_SYMBOL(dma_fence_allocate_private_stub);



/**

 * dma_fence_context_alloc - allocate an array of fence contexts

 * @num: amount of contexts to allocate

drivers/gpu/drm/arm/display/include/malidp_utils.h

+0 −3
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ 
#define has_bit(nr, mask)	(BIT(nr) & (mask))

#define has_bits(bits, mask)	(((bits) & (mask)) == (bits))



#define dp_for_each_set_bit(bit, mask) \

	for_each_set_bit((bit), ((unsigned long *)&(mask)), sizeof(mask) * 8)



#define dp_wait_cond(__cond, __tries, __min_range, __max_range)	\

({							\

	int num_tries = __tries;			\

drivers/gpu/drm/arm/display/komeda/komeda_dev.c

+3 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ core_id_show(struct device *dev, struct device_attribute *attr, char *buf) 
{

	struct komeda_dev *mdev = dev_to_mdev(dev);



	return snprintf(buf, PAGE_SIZE, "0x%08x\n", mdev->chip.core_id);

	return sysfs_emit(buf, "0x%08x\n", mdev->chip.core_id);

}

static DEVICE_ATTR_RO(core_id);
@@ -85,7 +85,7 @@ config_id_show(struct device *dev, struct device_attribute *attr, char *buf) 
		if (pipe->layers[i]->layer_type == KOMEDA_FMT_RICH_LAYER)

			config_id.n_richs++;

	}

	return snprintf(buf, PAGE_SIZE, "0x%08x\n", config_id.value);

	return sysfs_emit(buf, "0x%08x\n", config_id.value);

}

static DEVICE_ATTR_RO(config_id);
@@ -94,7 +94,7 @@ aclk_hz_show(struct device *dev, struct device_attribute *attr, char *buf) 
{

	struct komeda_dev *mdev = dev_to_mdev(dev);



	return snprintf(buf, PAGE_SIZE, "%lu\n", clk_get_rate(mdev->aclk));

	return sysfs_emit(buf, "%lu\n", clk_get_rate(mdev->aclk));

}

static DEVICE_ATTR_RO(aclk_hz);

drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c

+11 −5
Original line number Diff line number Diff line
@@ -46,8 +46,9 @@ void komeda_pipeline_destroy(struct komeda_dev *mdev, 
{

	struct komeda_component *c;

	int i;

	unsigned long avail_comps = pipe->avail_comps;



	dp_for_each_set_bit(i, pipe->avail_comps) {

	for_each_set_bit(i, &avail_comps, 32) {

		c = komeda_pipeline_get_component(pipe, i);

		komeda_component_destroy(mdev, c);

	}
@@ -247,6 +248,7 @@ static void komeda_pipeline_dump(struct komeda_pipeline *pipe) 
{

	struct komeda_component *c;

	int id;

	unsigned long avail_comps = pipe->avail_comps;



	DRM_INFO("Pipeline-%d: n_layers: %d, n_scalers: %d, output: %s.\n",

		 pipe->id, pipe->n_layers, pipe->n_scalers,
@@ -258,7 +260,7 @@ static void komeda_pipeline_dump(struct komeda_pipeline *pipe) 
		 pipe->of_output_links[1] ?

		 pipe->of_output_links[1]->full_name : "none");



	dp_for_each_set_bit(id, pipe->avail_comps) {

	for_each_set_bit(id, &avail_comps, 32) {

		c = komeda_pipeline_get_component(pipe, id);



		komeda_component_dump(c);
@@ -270,8 +272,9 @@ static void komeda_component_verify_inputs(struct komeda_component *c) 
	struct komeda_pipeline *pipe = c->pipeline;

	struct komeda_component *input;

	int id;

	unsigned long supported_inputs = c->supported_inputs;



	dp_for_each_set_bit(id, c->supported_inputs) {

	for_each_set_bit(id, &supported_inputs, 32) {

		input = komeda_pipeline_get_component(pipe, id);

		if (!input) {

			c->supported_inputs &= ~(BIT(id));
@@ -302,8 +305,9 @@ static void komeda_pipeline_assemble(struct komeda_pipeline *pipe) 
	struct komeda_component *c;

	struct komeda_layer *layer;

	int i, id;

	unsigned long avail_comps = pipe->avail_comps;



	dp_for_each_set_bit(id, pipe->avail_comps) {

	for_each_set_bit(id, &avail_comps, 32) {

		c = komeda_pipeline_get_component(pipe, id);

		komeda_component_verify_inputs(c);

	}
@@ -355,13 +359,15 @@ void komeda_pipeline_dump_register(struct komeda_pipeline *pipe, 
{

	struct komeda_component *c;

	u32 id;

	unsigned long avail_comps;



	seq_printf(sf, "\n======== Pipeline-%d ==========\n", pipe->id);



	if (pipe->funcs && pipe->funcs->dump_register)

		pipe->funcs->dump_register(pipe, sf);



	dp_for_each_set_bit(id, pipe->avail_comps) {

	avail_comps = pipe->avail_comps;

	for_each_set_bit(id, &avail_comps, 32) {

		c = komeda_pipeline_get_component(pipe, id);



		seq_printf(sf, "\n------%s------\n", c->name);

drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c

+11 −8
Original line number Diff line number Diff line
@@ -1231,14 +1231,15 @@ komeda_pipeline_unbound_components(struct komeda_pipeline *pipe, 
	struct komeda_pipeline_state *old = priv_to_pipe_st(pipe->obj.state);

	struct komeda_component_state *c_st;

	struct komeda_component *c;

	u32 disabling_comps, id;

	u32 id;

	unsigned long disabling_comps;



	WARN_ON(!old);



	disabling_comps = (~new->active_comps) & old->active_comps;



	/* unbound all disabling component */

	dp_for_each_set_bit(id, disabling_comps) {

	for_each_set_bit(id, &disabling_comps, 32) {

		c = komeda_pipeline_get_component(pipe, id);

		c_st = komeda_component_get_state_and_set_user(c,

				drm_st, NULL, new->crtc);
@@ -1286,7 +1287,8 @@ bool komeda_pipeline_disable(struct komeda_pipeline *pipe, 
	struct komeda_pipeline_state *old;

	struct komeda_component *c;

	struct komeda_component_state *c_st;

	u32 id, disabling_comps = 0;

	u32 id;

	unsigned long disabling_comps;



	old = komeda_pipeline_get_old_state(pipe, old_state);
@@ -1296,10 +1298,10 @@ bool komeda_pipeline_disable(struct komeda_pipeline *pipe, 
		disabling_comps = old->active_comps &

				  pipe->standalone_disabled_comps;



	DRM_DEBUG_ATOMIC("PIPE%d: active_comps: 0x%x, disabling_comps: 0x%x.\n",

	DRM_DEBUG_ATOMIC("PIPE%d: active_comps: 0x%x, disabling_comps: 0x%lx.\n",

			 pipe->id, old->active_comps, disabling_comps);



	dp_for_each_set_bit(id, disabling_comps) {

	for_each_set_bit(id, &disabling_comps, 32) {

		c = komeda_pipeline_get_component(pipe, id);

		c_st = priv_to_comp_st(c->obj.state);
@@ -1330,16 +1332,17 @@ void komeda_pipeline_update(struct komeda_pipeline *pipe, 
	struct komeda_pipeline_state *new = priv_to_pipe_st(pipe->obj.state);

	struct komeda_pipeline_state *old;

	struct komeda_component *c;

	u32 id, changed_comps = 0;

	u32 id;

	unsigned long changed_comps;



	old = komeda_pipeline_get_old_state(pipe, old_state);



	changed_comps = new->active_comps | old->active_comps;



	DRM_DEBUG_ATOMIC("PIPE%d: active_comps: 0x%x, changed: 0x%x.\n",

	DRM_DEBUG_ATOMIC("PIPE%d: active_comps: 0x%x, changed: 0x%lx.\n",

			 pipe->id, new->active_comps, changed_comps);



	dp_for_each_set_bit(id, changed_comps) {

	for_each_set_bit(id, &changed_comps, 32) {

		c = komeda_pipeline_get_component(pipe, id);



		if (new->active_comps & BIT(c->id))