Commit d67f2ec1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm fixes from Dave Airlie:
 "Regular fixes, not much a major amount. One thing though is Laurent
  fixed some Kconfig issues, and I'm carrying the rapidio kconfig change
  so the drm one for xlnx driver works. He hadn't got a response from
  rapidio maintainers.

  Otherwise, virtio, sun4i, tve200, ingenic have some fixes, one audio
  fix for i915 and a core docs fix.

  kconfig:
   - rapidio/xlnx kconfig fix

  core:
   - Documentation fix

  i915:
   - audio regression fix

  virtio:
   - Fix double free in virtio
   - Fix virtio unblank
   - Remove output->enabled from virtio, as it should use crtc_state

  sun4i:
   - Add missing put_device in sun4i, and other fixes
   - Handle sun4i alpha on lowest plane correctly

  tv200:
   - Fix tve200 enable/disable

  ingenic
   - Small ingenic fixes"

* tag 'drm-fixes-2020-09-11' of git://anongit.freedesktop.org/drm/drm:
  drm/i915: fix regression leading to display audio probe failure on GLK
  drm: xlnx: dpsub: Fix DMADEVICES Kconfig dependency
  rapidio: Replace 'select' DMAENGINES 'with depends on'
  drm/virtio: drop virtio_gpu_output->enabled
  drm/sun4i: backend: Disable alpha on the lowest plane on the A20
  drm/sun4i: backend: Support alpha property on lowest plane
  drm/sun4i: Fix DE2 YVU handling
  drm/tve200: Stabilize enable/disable
  dma-buf: fence-chain: Document missing dma_fence_chain_init() parameter in kerneldoc
  dma-buf: Fix kerneldoc of dma_buf_set_name()
  drm/virtio: fix unblank
  Documentation: fix dma-buf.rst underline length warning
  drm/sun4i: Fix dsi dcs long write function
  drm/ingenic: Fix driver not probing when IPU port is missing
  drm/ingenic: Fix leak of device_node pointer
  drm/sun4i: add missing put_device() call in sun8i_r40_tcon_tv_set_mux()
  drm/virtio: Revert "drm/virtio: Call the right shmem helpers"
parents b1df2a07 7f7a4795

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/i915/display/intel_display.c

+4 −6
Original line number Diff line number Diff line
@@ -14956,12 +14956,6 @@ static int intel_atomic_check(struct drm_device *dev, 
	if (dev_priv->wm.distrust_bios_wm)

		any_ms = true;













	if (any_ms) {













		ret = intel_modeset_checks(state);













		if (ret)













			goto fail;













	}



























	intel_fbc_choose_crtc(dev_priv, state);















	ret = calc_watermark_data(state);















	if (ret)









@@ -14976,6 +14970,10 @@ static int intel_atomic_check(struct drm_device *dev,













		goto fail;





























	if (any_ms) {













		ret = intel_modeset_checks(state);













		if (ret)













			goto fail;



























		ret = intel_modeset_calc_cdclk(state);















		if (ret)















			return ret;

































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);















}









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE