Merge "ODROID-N2: drm: add DRM featured kernel configuration" into odroidn2-4.9.y

arch/arm64/Kconfig.platforms

@@ -244,6 +244,7 @@ config ARCH_MESON64_ODROIDC3
 config ARCH_MESON64_ODROIDN2
 	bool "Hardkkernel's ODROID-N2 Single Board Computer"
 	select ARCH_MESON64_ODROID_COMMON
+	select DRM_BIFROST if DRM_MESON
 	help
 	  This enables support for the board ODROID-N2 of Hardkernel
 	  which is based on ARMv8 SoC of AMLogic, Inc.

arch/arm64/boot/dts/amlogic/Makefile

@@ -10,5 +10,6 @@ endif
 dtb-$(CONFIG_ARCH_MESON64_ODROIDC3) += meson64_odroidc3.dtb
 dtb-$(CONFIG_ARCH_MESON64_ODROIDC3) += meson64_odroidc3_android.dtb
 dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += meson64_odroidn2.dtb
+dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += meson64_odroidn2_drm.dtb
 dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += meson64_odroidn2_android.dtb
 dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += meson64_odroidn2_spibios.dtb

arch/arm64/boot/dts/amlogic/meson64_odroidn2_drm.dts

@@ -0,0 +1,40 @@
+/*
+ * arch/arm64/boot/dts/amlogic/meson64_odroidn2_drm.dts
+ *
+ * Copyright (C) 2019 Hardkernel Co,. Ltd. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ */
+
+/dts-v1/;
+
+#include "meson64_odroidn2.dts"
+#include "mesong12a_drm.dtsi"
+
+&meson_fb {
+	status = "disabled";
+};
+
+&drm_vpu {
+	status = "okay";
+	compatible = "amlogic,meson-g12b-vpu";
+	logo_addr = "0x7f800000";
+};
+
+&drm_amhdmitx {
+	status = "okay";
+	hdcp = "disabled";
+};
+
+&drm_lcd {
+	status = "disabled";
+};

drivers/gpu/Makefile

@@ -4,4 +4,7 @@
 obj-$(CONFIG_TEGRA_HOST1X)	+= host1x/
 obj-y				+= drm/ vga/
 obj-$(CONFIG_IMX_IPUV3_CORE)	+= ipu-v3/
+
+ifneq ($(CONFIG_DRM_BIFROST),y)
 obj-y                   += arm/
+endif

drivers/gpu/drm/Kconfig

@@ -300,4 +300,9 @@ config DRM_SAVAGE
 	  Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
 	  chipset. If M is selected the module will be called savage.
 
+config DRM_BIFROST
+	bool
+	depends on HAS_IOMEM && DRM_LEGACY && DRM
+	help
+
 endif # DRM_LEGACY

drivers/gpu/drm/Makefile

@@ -87,3 +87,5 @@ obj-$(CONFIG_DRM_FSL_DCU) += fsl-dcu/
 obj-$(CONFIG_DRM_ETNAVIV) += etnaviv/
 obj-$(CONFIG_DRM_ARCPGU)+= arc/
 obj-y			+= hisilicon/
+
+obj-$(CONFIG_DRM_BIFROST) += bifrost/