Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91c0719c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2017-06-15' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes 

Driver Changes:
- dw-hdmi: Fix compilation error if REGMAP_MMIO not selected (Laurent)
- host1x: Fix incorrect return value (Christophe)
- tegra: Shore up idr API usage in tegra staging code (Dmitry)
- mgag200: Always use HiPri mode for G200e4v2 and limit max bandwidth (Mathieu)
- mxsfb: Ensure display can be lit up without bootloader initialization (Fabio)

Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Dmitry Osipenko <digetx@gmail.com>
Cc: Mathieu Larouche <mathieu.larouche@matrox.com>
Cc: Fabio Estevam <fabio.estevam@nxp.com>

* tag 'drm-misc-fixes-2017-06-15' of git://anongit.freedesktop.org/git/drm-misc:
  drm: mxsfb_crtc: Reset the eLCDIF controller
  drm/mgag200: Fix to always set HiPri for G200e4 V2
  drm/tegra: Correct idr_alloc() minimum id
  drm/tegra: Fix lockup on a use of staging API
  gpu: host1x: Fix error handling
  drm: dw-hdmi: Fix compilation breakage by selecting REGMAP_MMIO
parents 1b22f6d7 0f933328

drivers/gpu/drm/bridge/synopsys/Kconfig

+1 −0
Original line number Diff line number Diff line 
config DRM_DW_HDMI

	tristate

	select DRM_KMS_HELPER

	select REGMAP_MMIO



config DRM_DW_HDMI_AHB_AUDIO

	tristate "Synopsys Designware AHB Audio interface"

drivers/gpu/drm/mgag200/mgag200_mode.c

+8 −1
Original line number Diff line number Diff line
@@ -1173,7 +1173,10 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc, 




	if (IS_G200_SE(mdev)) {

		if (mdev->unique_rev_id >= 0x02) {

		if  (mdev->unique_rev_id >= 0x04) {

			WREG8(MGAREG_CRTCEXT_INDEX, 0x06);

			WREG8(MGAREG_CRTCEXT_DATA, 0);

		} else if (mdev->unique_rev_id >= 0x02) {

			u8 hi_pri_lvl;

			u32 bpp;

			u32 mb;
@@ -1639,6 +1642,10 @@ static int mga_vga_mode_valid(struct drm_connector *connector, 
			if (mga_vga_calculate_mode_bandwidth(mode, bpp)

				> (30100 * 1024))

				return MODE_BANDWIDTH;

		} else {

			if (mga_vga_calculate_mode_bandwidth(mode, bpp)

				> (55000 * 1024))

				return MODE_BANDWIDTH;

		}

	} else if (mdev->type == G200_WB) {

		if (mode->hdisplay > 1280)

drivers/gpu/drm/mxsfb/mxsfb_crtc.c

+42 −0
Original line number Diff line number Diff line
@@ -35,6 +35,13 @@ 
#include "mxsfb_drv.h"

#include "mxsfb_regs.h"



#define MXS_SET_ADDR		0x4

#define MXS_CLR_ADDR		0x8

#define MODULE_CLKGATE		BIT(30)

#define MODULE_SFTRST		BIT(31)

/* 1 second delay should be plenty of time for block reset */

#define RESET_TIMEOUT		1000000



static u32 set_hsync_pulse_width(struct mxsfb_drm_private *mxsfb, u32 val)

{

	return (val & mxsfb->devdata->hs_wdth_mask) <<
@@ -159,6 +166,36 @@ static void mxsfb_disable_controller(struct mxsfb_drm_private *mxsfb) 
		clk_disable_unprepare(mxsfb->clk_disp_axi);

}



/*

 * Clear the bit and poll it cleared.  This is usually called with

 * a reset address and mask being either SFTRST(bit 31) or CLKGATE

 * (bit 30).

 */

static int clear_poll_bit(void __iomem *addr, u32 mask)

{

	u32 reg;



	writel(mask, addr + MXS_CLR_ADDR);

	return readl_poll_timeout(addr, reg, !(reg & mask), 0, RESET_TIMEOUT);

}



static int mxsfb_reset_block(void __iomem *reset_addr)

{

	int ret;



	ret = clear_poll_bit(reset_addr, MODULE_SFTRST);

	if (ret)

		return ret;



	writel(MODULE_CLKGATE, reset_addr + MXS_CLR_ADDR);



	ret = clear_poll_bit(reset_addr, MODULE_SFTRST);

	if (ret)

		return ret;



	return clear_poll_bit(reset_addr, MODULE_CLKGATE);

}



static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb)

{

	struct drm_display_mode *m = &mxsfb->pipe.crtc.state->adjusted_mode;
@@ -173,6 +210,11 @@ static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb) 
	 */

	mxsfb_enable_axi_clk(mxsfb);



	/* Mandatory eLCDIF reset as per the Reference Manual */

	err = mxsfb_reset_block(mxsfb->base);

	if (err)

		return;



	/* Clear the FIFOs */

	writel(CTRL1_FIFO_CLEAR, mxsfb->base + LCDC_CTRL1 + REG_SET);

drivers/gpu/drm/tegra/drm.c

+5 −17
Original line number Diff line number Diff line
@@ -451,18 +451,6 @@ int tegra_drm_submit(struct tegra_drm_context *context, 




#ifdef CONFIG_DRM_TEGRA_STAGING

static struct tegra_drm_context *

tegra_drm_file_get_context(struct tegra_drm_file *file, u32 id)

{

	struct tegra_drm_context *context;



	mutex_lock(&file->lock);

	context = idr_find(&file->contexts, id);

	mutex_unlock(&file->lock);



	return context;

}



static int tegra_gem_create(struct drm_device *drm, void *data,

			    struct drm_file *file)

{
@@ -551,7 +539,7 @@ static int tegra_client_open(struct tegra_drm_file *fpriv, 
	if (err < 0)

		return err;



	err = idr_alloc(&fpriv->contexts, context, 0, 0, GFP_KERNEL);

	err = idr_alloc(&fpriv->contexts, context, 1, 0, GFP_KERNEL);

	if (err < 0) {

		client->ops->close_channel(context);

		return err;
@@ -606,7 +594,7 @@ static int tegra_close_channel(struct drm_device *drm, void *data, 


	mutex_lock(&fpriv->lock);



	context = tegra_drm_file_get_context(fpriv, args->context);

	context = idr_find(&fpriv->contexts, args->context);

	if (!context) {

		err = -EINVAL;

		goto unlock;
@@ -631,7 +619,7 @@ static int tegra_get_syncpt(struct drm_device *drm, void *data, 


	mutex_lock(&fpriv->lock);



	context = tegra_drm_file_get_context(fpriv, args->context);

	context = idr_find(&fpriv->contexts, args->context);

	if (!context) {

		err = -ENODEV;

		goto unlock;
@@ -660,7 +648,7 @@ static int tegra_submit(struct drm_device *drm, void *data, 


	mutex_lock(&fpriv->lock);



	context = tegra_drm_file_get_context(fpriv, args->context);

	context = idr_find(&fpriv->contexts, args->context);

	if (!context) {

		err = -ENODEV;

		goto unlock;
@@ -685,7 +673,7 @@ static int tegra_get_syncpt_base(struct drm_device *drm, void *data, 


	mutex_lock(&fpriv->lock);



	context = tegra_drm_file_get_context(fpriv, args->context);

	context = idr_find(&fpriv->contexts, args->context);

	if (!context) {

		err = -ENODEV;

		goto unlock;

drivers/gpu/host1x/dev.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static int host1x_probe(struct platform_device *pdev) 


	host->rst = devm_reset_control_get(&pdev->dev, "host1x");

	if (IS_ERR(host->rst)) {

		err = PTR_ERR(host->clk);

		err = PTR_ERR(host->rst);

		dev_err(&pdev->dev, "failed to get reset: %d\n", err);

		return err;

	}