Commit 04ea7dcb authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next 



Pull in the hibmc driver stuff so I can apply 2 trivial fixups from
Dan&Arnd.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents 2761ba6c 43167f6c

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4153,6 +4153,7 @@ F: drivers/gpu/drm/gma500/ 


DRM DRIVERS FOR HISILICON

M:	Xinliang Liu <z.liuxinliang@hisilicon.com>

M:	Rongrong Zou <zourongrong@gmail.com>

R:	Xinwei Kong <kong.kongxinwei@hisilicon.com>

R:	Chen Feng <puck.chen@hisilicon.com>

L:	dri-devel@lists.freedesktop.org

drivers/gpu/drm/hisilicon/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,4 +2,5 @@ 
# hisilicon drm device configuration.

# Please keep this list sorted alphabetically



source "drivers/gpu/drm/hisilicon/hibmc/Kconfig"

source "drivers/gpu/drm/hisilicon/kirin/Kconfig"

drivers/gpu/drm/hisilicon/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,4 +2,5 @@ 
# Makefile for hisilicon drm drivers.

# Please keep this list sorted alphabetically



obj-$(CONFIG_DRM_HISI_HIBMC) += hibmc/

obj-$(CONFIG_DRM_HISI_KIRIN) += kirin/

drivers/gpu/drm/hisilicon/hibmc/Kconfig

0 → 100644
+9 −0
Original line number Diff line number Diff line 
config DRM_HISI_HIBMC

	tristate "DRM Support for Hisilicon Hibmc"

	depends on DRM && PCI

	select DRM_KMS_HELPER

	select DRM_TTM



	help

	  Choose this option if you have a Hisilicon Hibmc soc chipset.

	  If M is selected the module will be called hibmc-drm.

drivers/gpu/drm/hisilicon/hibmc/Makefile

0 → 100644
+4 −0
Original line number Diff line number Diff line 
ccflags-y := -Iinclude/drm

hibmc-drm-y := hibmc_drm_drv.o hibmc_drm_de.o hibmc_drm_vdac.o hibmc_drm_fbdev.o hibmc_ttm.o



obj-$(CONFIG_DRM_HISI_HIBMC) += hibmc-drm.o