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

Commit 6559436d authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/media into drm-next 

some rcar-du fixes.

* 'drm/next/du' of git://linuxtv.org/pinchartl/media:
  drm: rcar-du: error message is not needed for EPROBE_DEFER
  drm: rcar-du: error message is not needed for drm_vblank_init()
  rcar-du: add/rename DEFR6 TCON bits
parents 9da1030e ccf49251

drivers/gpu/drm/rcar-du/rcar_du_drv.c

+4 −4
Original line number Diff line number Diff line
@@ -336,15 +336,15 @@ static int rcar_du_probe(struct platform_device *pdev) 
	 * disabled for all CRTCs.

	 */

	ret = drm_vblank_init(ddev, (1 << rcdu->info->num_crtcs) - 1);

	if (ret < 0) {

		dev_err(&pdev->dev, "failed to initialize vblank\n");

	if (ret < 0)

		goto error;

	}



	/* DRM/KMS objects */

	ret = rcar_du_modeset_init(rcdu);

	if (ret < 0) {

		dev_err(&pdev->dev, "failed to initialize DRM/KMS (%d)\n", ret);

		if (ret != -EPROBE_DEFER)

			dev_err(&pdev->dev,

				"failed to initialize DRM/KMS (%d)\n", ret);

		goto error;

	}

drivers/gpu/drm/rcar-du/rcar_du_regs.h

+3 −2
Original line number Diff line number Diff line
@@ -195,9 +195,10 @@ 
#define DEFR6_ODPM12_DISP	(2 << 8)

#define DEFR6_ODPM12_CDE	(3 << 8)

#define DEFR6_ODPM12_MASK	(3 << 8)

#define DEFR6_TCNE2		(1 << 6)

#define DEFR6_TCNE1		(1 << 6)

#define DEFR6_TCNE0		(1 << 4)

#define DEFR6_MLOS1		(1 << 2)

#define DEFR6_DEFAULT		(DEFR6_CODE | DEFR6_TCNE2)

#define DEFR6_DEFAULT		(DEFR6_CODE | DEFR6_TCNE1)



/* -----------------------------------------------------------------------------

 * R8A7790-only Control Registers