Commit 59f7dcd9 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



One Kconfig fix for bridge/cdns, a missing include for hypervb_fb, an
out-of-bound access fix for gma500 and a unbalanced regulator fix for
mcde.

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20201112130726.qwtryqvgspmljkax@gilmour.lan
parents f8394f23 a6c40b80

drivers/gpu/drm/bridge/cadence/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ config DRM_CDNS_MHDP8546 
if DRM_CDNS_MHDP8546



config DRM_CDNS_MHDP8546_J721E

	depends on ARCH_K3_J721E_SOC || COMPILE_TEST

	depends on ARCH_K3 || COMPILE_TEST

	bool "J721E Cadence DPI/DP wrapper support"

	default y

	help

drivers/gpu/drm/gma500/psb_irq.c

+12 −22
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ int psb_irq_postinstall(struct drm_device *dev) 
{

	struct drm_psb_private *dev_priv = dev->dev_private;

	unsigned long irqflags;

	unsigned int i;



	spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags);
@@ -359,20 +360,12 @@ int psb_irq_postinstall(struct drm_device *dev) 
	PSB_WVDC32(dev_priv->vdc_irq_mask, PSB_INT_ENABLE_R);

	PSB_WVDC32(0xFFFFFFFF, PSB_HWSTAM);



	if (dev->vblank[0].enabled)

		psb_enable_pipestat(dev_priv, 0, PIPE_VBLANK_INTERRUPT_ENABLE);

	else

		psb_disable_pipestat(dev_priv, 0, PIPE_VBLANK_INTERRUPT_ENABLE);



	if (dev->vblank[1].enabled)

		psb_enable_pipestat(dev_priv, 1, PIPE_VBLANK_INTERRUPT_ENABLE);

	else

		psb_disable_pipestat(dev_priv, 1, PIPE_VBLANK_INTERRUPT_ENABLE);



	if (dev->vblank[2].enabled)

		psb_enable_pipestat(dev_priv, 2, PIPE_VBLANK_INTERRUPT_ENABLE);

	for (i = 0; i < dev->num_crtcs; ++i) {

		if (dev->vblank[i].enabled)

			psb_enable_pipestat(dev_priv, i, PIPE_VBLANK_INTERRUPT_ENABLE);

		else

		psb_disable_pipestat(dev_priv, 2, PIPE_VBLANK_INTERRUPT_ENABLE);

			psb_disable_pipestat(dev_priv, i, PIPE_VBLANK_INTERRUPT_ENABLE);

	}



	if (dev_priv->ops->hotplug_enable)

		dev_priv->ops->hotplug_enable(dev, true);
@@ -385,6 +378,7 @@ void psb_irq_uninstall(struct drm_device *dev) 
{

	struct drm_psb_private *dev_priv = dev->dev_private;

	unsigned long irqflags;

	unsigned int i;



	spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags);
@@ -393,14 +387,10 @@ void psb_irq_uninstall(struct drm_device *dev) 


	PSB_WVDC32(0xFFFFFFFF, PSB_HWSTAM);



	if (dev->vblank[0].enabled)

		psb_disable_pipestat(dev_priv, 0, PIPE_VBLANK_INTERRUPT_ENABLE);



	if (dev->vblank[1].enabled)

		psb_disable_pipestat(dev_priv, 1, PIPE_VBLANK_INTERRUPT_ENABLE);



	if (dev->vblank[2].enabled)

		psb_disable_pipestat(dev_priv, 2, PIPE_VBLANK_INTERRUPT_ENABLE);

	for (i = 0; i < dev->num_crtcs; ++i) {

		if (dev->vblank[i].enabled)

			psb_disable_pipestat(dev_priv, i, PIPE_VBLANK_INTERRUPT_ENABLE);

	}



	dev_priv->vdc_irq_mask &= _PSB_IRQ_SGX_FLAG |

				  _PSB_IRQ_MSVDX_FLAG |

drivers/gpu/drm/mcde/mcde_drv.c

+7 −1
Original line number Diff line number Diff line
@@ -413,7 +413,13 @@ static int mcde_probe(struct platform_device *pdev) 
					      match);

	if (ret) {

		dev_err(dev, "failed to add component master\n");

		goto clk_disable;

		/*

		 * The EPOD regulator is already disabled at this point so some

		 * special errorpath code is needed

		 */

		clk_disable_unprepare(mcde->mcde_clk);

		regulator_disable(mcde->vana);

		return ret;

	}



	return 0;

drivers/video/fbdev/hyperv_fb.c

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 


#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/vmalloc.h>

#include <linux/init.h>

#include <linux/completion.h>

#include <linux/fb.h>