Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

drm/exynos: Fix multiplatform breakage for ipp/gsc

There is no need to include "plat/map-base.h" in ipp driver. Remove
this and enable this driver for multi-platform.

However gsc driver is not multiplatform compliant yet, so make the
compilation conditional upon !ARCH_MULTIPLATFORM.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Tushar Behera 11 years ago
parent
6ca605f7c7
commit
86ac5b84ef
2 changed files with 2 additions and 3 deletions
Unified View Show Diff Stats
  1. 2 2
      drivers/gpu/drm/exynos/Kconfig
  2. 0 1
      drivers/gpu/drm/exynos/exynos_drm_ipp.c

+ 2 - 2
drivers/gpu/drm/exynos/Kconfig
View File 

@@ -51,7 +51,7 @@ config DRM_EXYNOS_G2D
 
 
 
 config DRM_EXYNOS_IPP
 
 config DRM_EXYNOS_IPP
 
 	bool "Exynos DRM IPP"
 
 	bool "Exynos DRM IPP"
 
-	depends on DRM_EXYNOS && !ARCH_MULTIPLATFORM
 
+	depends on DRM_EXYNOS
 
 	help
 
 	help
 
 	  Choose this option if you want to use IPP feature for DRM.
 
 	  Choose this option if you want to use IPP feature for DRM.
 
 
 
@@ -69,6 +69,6 @@ config DRM_EXYNOS_ROTATOR
 
 
 
 config DRM_EXYNOS_GSC
 
 config DRM_EXYNOS_GSC
 
 	bool "Exynos DRM GSC"
 
 	bool "Exynos DRM GSC"
 
-	depends on DRM_EXYNOS_IPP && ARCH_EXYNOS5
 
+	depends on DRM_EXYNOS_IPP && ARCH_EXYNOS5 && !ARCH_MULTIPLATFORM
 
 	help
 
 	help
 
 	  Choose this option if you want to use Exynos GSC for DRM.
 
 	  Choose this option if you want to use Exynos GSC for DRM.

+ 0 - 1
drivers/gpu/drm/exynos/exynos_drm_ipp.c
View File 

@@ -16,7 +16,6 @@
 
 #include <linux/types.h>
 
 #include <linux/types.h>
 
 #include <linux/clk.h>
 
 #include <linux/clk.h>
 
 #include <linux/pm_runtime.h>
 
 #include <linux/pm_runtime.h>
 
-#include <plat/map-base.h>
 
 
 
 #include <drm/drmP.h>
 
 #include <drm/drmP.h>
 
 #include <drm/exynos_drm.h>
 
 #include <drm/exynos_drm.h>