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

Commit 4ef0bef2 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'exynos-drm-next-for-v4.16' of... 

Merge tag 'exynos-drm-next-for-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next

Remove lagacy IPP driver
- This driver isn't used anymore so remove it. Marek is preparing new one
  which includes completely rewritten API so this driver will be replaced
  with the new version[1] later.
And cleanups.

[1] https://patches.linaro.org/cover/118386/

* tag 'exynos-drm-next-for-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
  drm/exynos: ipp: Remove Exynos DRM IPP subsystem
  drm/exynos/decon: Add include guard to the Exynos7 header
  drm/exynos/decon: Move headers from global to local place
  drm/exynos: decon5433: Remove unnecessary platform_get_resource() error check
parents a9742b79 8ded5941

drivers/gpu/drm/exynos/Kconfig

+3 −8
Original line number Diff line number Diff line
@@ -95,26 +95,21 @@ config DRM_EXYNOS_G2D 
	help

	  Choose this option if you want to use Exynos G2D for DRM.



config DRM_EXYNOS_IPP

	bool "Image Post Processor"

	help

	  Choose this option if you want to use IPP feature for DRM.



config DRM_EXYNOS_FIMC

	bool "FIMC"

	depends on DRM_EXYNOS_IPP && MFD_SYSCON

	depends on BROKEN && MFD_SYSCON

	help

	  Choose this option if you want to use Exynos FIMC for DRM.



config DRM_EXYNOS_ROTATOR

	bool "Rotator"

	depends on DRM_EXYNOS_IPP

	depends on BROKEN

	help

	  Choose this option if you want to use Exynos Rotator for DRM.



config DRM_EXYNOS_GSC

	bool "GScaler"

	depends on DRM_EXYNOS_IPP && ARCH_EXYNOS5 && VIDEO_SAMSUNG_EXYNOS_GSC=n

	depends on BROKEN && ARCH_EXYNOS5 && VIDEO_SAMSUNG_EXYNOS_GSC=n

	help

	  Choose this option if you want to use Exynos GSC for DRM.

drivers/gpu/drm/exynos/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ exynosdrm-$(CONFIG_DRM_EXYNOS_MIXER) += exynos_mixer.o 
exynosdrm-$(CONFIG_DRM_EXYNOS_HDMI)	+= exynos_hdmi.o

exynosdrm-$(CONFIG_DRM_EXYNOS_VIDI)	+= exynos_drm_vidi.o

exynosdrm-$(CONFIG_DRM_EXYNOS_G2D)	+= exynos_drm_g2d.o

exynosdrm-$(CONFIG_DRM_EXYNOS_IPP)	+= exynos_drm_ipp.o

exynosdrm-$(CONFIG_DRM_EXYNOS_FIMC)	+= exynos_drm_fimc.o

exynosdrm-$(CONFIG_DRM_EXYNOS_ROTATOR)	+= exynos_drm_rotator.o

exynosdrm-$(CONFIG_DRM_EXYNOS_GSC)	+= exynos_drm_gsc.o

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+1 −7
Original line number Diff line number Diff line
@@ -21,13 +21,12 @@ 
#include <linux/pm_runtime.h>

#include <linux/regmap.h>



#include <video/exynos5433_decon.h>



#include "exynos_drm_drv.h"

#include "exynos_drm_crtc.h"

#include "exynos_drm_fb.h"

#include "exynos_drm_plane.h"

#include "exynos_drm_iommu.h"

#include "regs-decon5433.h"



#define DSD_CFG_MUX 0x1004

#define DSD_CFG_MUX_TE_UNMASK_GLOBAL BIT(13)
@@ -744,11 +743,6 @@ static int exynos5433_decon_probe(struct platform_device *pdev) 
	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(dev, "cannot find IO resource\n");

		return -ENXIO;

	}



	ctx->addr = devm_ioremap_resource(dev, res);

	if (IS_ERR(ctx->addr)) {

		dev_err(dev, "ioremap failed\n");

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+1 −1
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@ 


#include <video/of_display_timing.h>

#include <video/of_videomode.h>

#include <video/exynos7_decon.h>



#include "exynos_drm_crtc.h"

#include "exynos_drm_plane.h"

#include "exynos_drm_drv.h"

#include "exynos_drm_fb.h"

#include "exynos_drm_iommu.h"

#include "regs-decon7.h"



/*

 * DECON stands for Display and Enhancement controller.

drivers/gpu/drm/exynos/exynos_drm_drv.c

+0 −12
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include "exynos_drm_plane.h"

#include "exynos_drm_vidi.h"

#include "exynos_drm_g2d.h"

#include "exynos_drm_ipp.h"

#include "exynos_drm_iommu.h"



#define DRIVER_NAME	"exynos"
@@ -109,14 +108,6 @@ static const struct drm_ioctl_desc exynos_ioctls[] = { 
			DRM_AUTH | DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(EXYNOS_G2D_EXEC, exynos_g2d_exec_ioctl,

			DRM_AUTH | DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(EXYNOS_IPP_GET_PROPERTY, exynos_drm_ipp_get_property,

			DRM_AUTH | DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(EXYNOS_IPP_SET_PROPERTY, exynos_drm_ipp_set_property,

			DRM_AUTH | DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(EXYNOS_IPP_QUEUE_BUF, exynos_drm_ipp_queue_buf,

			DRM_AUTH | DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(EXYNOS_IPP_CMD_CTRL, exynos_drm_ipp_cmd_ctrl,

			DRM_AUTH | DRM_RENDER_ALLOW),

};



static const struct file_operations exynos_drm_driver_fops = {
@@ -256,9 +247,6 @@ static struct exynos_drm_driver_info exynos_drm_drivers[] = { 
		DRV_PTR(rotator_driver, CONFIG_DRM_EXYNOS_ROTATOR),

	}, {

		DRV_PTR(gsc_driver, CONFIG_DRM_EXYNOS_GSC),

	}, {

		DRV_PTR(ipp_driver, CONFIG_DRM_EXYNOS_IPP),

		DRM_VIRTUAL_DEVICE

	}, {

		&exynos_drm_platform_driver,

		DRM_VIRTUAL_DEVICE