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

Commit 69056e9a authored by Dave Airlie's avatar Dave Airlie
Browse files

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

misc rcar changes.

* 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev:
  drm: rcar-du: Fix compilation warning
  drm: rcar-du: Use ARCH_RENESAS
  drm: rcar-du: Clarify vsp dependency
parents 027b3f8b 077d6737

drivers/gpu/drm/rcar-du/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ config DRM_RCAR_DU 
	tristate "DRM Support for R-Car Display Unit"

	depends on DRM && OF

	depends on ARM || ARM64

	depends on ARCH_SHMOBILE || COMPILE_TEST

	depends on ARCH_RENESAS || COMPILE_TEST

	select DRM_KMS_HELPER

	select DRM_KMS_CMA_HELPER

	select DRM_GEM_CMA_HELPER
@@ -27,6 +27,6 @@ config DRM_RCAR_LVDS 
config DRM_RCAR_VSP

	bool "R-Car DU VSP Compositor Support"

	depends on DRM_RCAR_DU

	depends on VIDEO_RENESAS_VSP1

	depends on VIDEO_RENESAS_VSP1=y || (VIDEO_RENESAS_VSP1 && DRM_RCAR_DU=m)

	help

	  Enable support to expose the R-Car VSP Compositor as KMS planes.

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

+0 −1
Original line number Diff line number Diff line
@@ -297,7 +297,6 @@ static int rcar_du_probe(struct platform_device *pdev) 
{

	struct device_node *np = pdev->dev.of_node;

	struct rcar_du_device *rcdu;

	struct drm_connector *connector;

	struct drm_device *ddev;

	struct resource *mem;

	int ret;