Commit 7f7a4795 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



drm-misc-fixes for v5.9-rc5:
- Fix double free in virtio.
- Add missing put_device in sun4i, and other fixes.
- Small ingenic fixes.
- Handle sun4i alpha on lowest plane correctly.
- Remove output->enabled from virtio, as it should use crtc_state.
- Fix tve200 enable/disable.
- Documentation fix.
- Fix virtio unblank.

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

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/478b49d1-b1b3-c983-7056-8a89249be435@mblankhorst.nl
parents 7bf23bfb fc7f148f

Documentation/driver-api/dma-buf.rst

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ DMA Fence uABI/Sync File 
   :internal:



Indefinite DMA Fences

~~~~~~~~~~~~~~~~~~~~

~~~~~~~~~~~~~~~~~~~~~



At various times &dma_fence with an indefinite time until dma_fence_wait()

finishes have been proposed. Examples include:

drivers/dma-buf/dma-buf.c

+3 −3
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ out: 
 * name of the dma-buf if the same piece of memory is used for multiple

 * purpose between different devices.

 *

 * @dmabuf [in]     dmabuf buffer that will be renamed.

 * @dmabuf: [in]     dmabuf buffer that will be renamed.

 * @buf:    [in]     A piece of userspace memory that contains the name of

 *                   the dma-buf.

 *

drivers/dma-buf/dma-fence-chain.c

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ EXPORT_SYMBOL(dma_fence_chain_ops); 
 * @chain: the chain node to initialize

 * @prev: the previous fence

 * @fence: the current fence

 * @seqno: the sequence number to use for the fence chain

 *

 * Initialize a new chain node and either start a new chain or add the node to

 * the existing chain of the previous fence.

drivers/gpu/drm/ingenic/ingenic-drm-drv.c

+12 −8
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ static void ingenic_drm_unbind_all(void *d) 
	component_unbind_all(priv->dev, &priv->drm);

}



static int ingenic_drm_bind(struct device *dev)

static int ingenic_drm_bind(struct device *dev, bool has_components)

{

	struct platform_device *pdev = to_platform_device(dev);

	const struct jz_soc_info *soc_info;
@@ -808,7 +808,7 @@ static int ingenic_drm_bind(struct device *dev) 
			return ret;

		}



		if (IS_ENABLED(CONFIG_DRM_INGENIC_IPU)) {

		if (IS_ENABLED(CONFIG_DRM_INGENIC_IPU) && has_components) {

			ret = component_bind_all(dev, drm);

			if (ret) {

				if (ret != -EPROBE_DEFER)
@@ -939,6 +939,11 @@ err_pixclk_disable: 
	return ret;

}



static int ingenic_drm_bind_with_components(struct device *dev)

{

	return ingenic_drm_bind(dev, true);

}



static int compare_of(struct device *dev, void *data)

{

	return dev->of_node == data;
@@ -957,7 +962,7 @@ static void ingenic_drm_unbind(struct device *dev) 
}



static const struct component_master_ops ingenic_master_ops = {

	.bind = ingenic_drm_bind,

	.bind = ingenic_drm_bind_with_components,

	.unbind = ingenic_drm_unbind,

};
@@ -968,16 +973,15 @@ static int ingenic_drm_probe(struct platform_device *pdev) 
	struct device_node *np;



	if (!IS_ENABLED(CONFIG_DRM_INGENIC_IPU))

		return ingenic_drm_bind(dev);

		return ingenic_drm_bind(dev, false);



	/* IPU is at port address 8 */

	np = of_graph_get_remote_node(dev->of_node, 8, 0);

	if (!np) {

		dev_err(dev, "Unable to get IPU node\n");

		return -EINVAL;

	}

	if (!np)

		return ingenic_drm_bind(dev, false);



	drm_of_component_match_add(dev, &match, compare_of, np);

	of_node_put(np);



	return component_master_add_with_match(dev, &ingenic_master_ops, match);

}

drivers/gpu/drm/sun4i/sun4i_backend.c

+1 −3
Original line number Diff line number Diff line
@@ -589,8 +589,7 @@ static int sun4i_backend_atomic_check(struct sunxi_engine *engine, 


	/* We can't have an alpha plane at the lowest position */

	if (!backend->quirks->supports_lowest_plane_alpha &&

	    (plane_states[0]->fb->format->has_alpha ||

	    (plane_states[0]->alpha != DRM_BLEND_ALPHA_OPAQUE)))

	    (plane_states[0]->alpha != DRM_BLEND_ALPHA_OPAQUE))

		return -EINVAL;



	for (i = 1; i < num_planes; i++) {
@@ -995,7 +994,6 @@ static const struct sun4i_backend_quirks sun6i_backend_quirks = { 


static const struct sun4i_backend_quirks sun7i_backend_quirks = {

	.needs_output_muxing = true,

	.supports_lowest_plane_alpha = true,

};



static const struct sun4i_backend_quirks sun8i_a33_backend_quirks = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE