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

Commit 6a5956b3 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: make msm_drm as module for GKI"

parents ef37df40 6cda336f

Makefile

+6 −2
Original line number Diff line number Diff line
@@ -10,8 +10,13 @@ LINUXINCLUDE += -include $(srctree)/techpack/display/config/konadispconf.h 
endif



ifeq ($(CONFIG_ARCH_LAHAINA), y)

     ifeq ($(CONFIG_QGKI), y)

		include $(srctree)/techpack/display/config/lahainadisp.conf

LINUXINCLUDE    += -include $(srctree)/techpack/display/config/lahainadispconf.h

     else

		include $(srctree)/techpack/display/config/gki_lahainadisp.conf

LINUXINCLUDE    += -include $(srctree)/techpack/display/config/gki_lahainadispconf.h

     endif

LINUXINCLUDE    += \

		   -I$(srctree)/techpack/display/include/uapi/display \

		   -I$(srctree)/techpack/display/include
@@ -36,4 +41,3 @@ endif 


obj-$(CONFIG_DRM_MSM) += msm/

obj-$(CONFIG_MSM_SDE_ROTATOR) += rotator/
 
obj-$(CONFIG_HDCP_QSEECOM) += hdcp/

config/gki_lahainadisp.conf

0 → 100644
+11 −0
Original line number Diff line number Diff line 
export CONFIG_DRM_MSM=y

export CONFIG_DRM_MSM_SDE=y

export CONFIG_SYNC_FILE=y

export CONFIG_DRM_MSM_DSI=y

export CONFIG_DRM_MSM_DP=y

export CONFIG_DSI_PARSER=y

export CONFIG_QCOM_MDSS_PLL=y

export CONFIG_DRM_SDE_WB=y

export CONFIG_DRM_MSM_REGISTER_LOGGING=y

export CONFIG_DRM_SDE_RSC=y

export CONFIG_DISPLAY_BUILD=m

config/gki_lahainadispconf.h

0 → 100644
+18 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2020, The Linux Foundation. All rights reserved.

 */



#define CONFIG_DRM_MSM 1

#define CONFIG_DRM_MSM_SDE 1

#define CONFIG_SYNC_FILE 1

#define CONFIG_DRM_MSM_DSI 1

#define CONFIG_DRM_MSM_DP 1

#define CONFIG_DSI_PARSER 1

#define CONFIG_DRM_SDE_WB 1

#define CONFIG_DRM_MSM_REGISTER_LOGGING 1

#define CONFIG_DRM_SDE_EVTLOG_DEBUG 1

#define CONFIG_QCOM_MDSS_PLL 1

#define CONFIG_GKI_DISPLAY 1

#define CONFIG_DRM_SDE_RSC 1

config/lahainadisp.conf

+1 −2
Original line number Diff line number Diff line 
ifeq ($(CONFIG_QGKI),y)

export CONFIG_DRM_MSM=y

export CONFIG_DRM_MSM_SDE=y

export CONFIG_DRM_MSM_DP=y
@@ -9,4 +8,4 @@ export CONFIG_DRM_SDE_WB=y 
export CONFIG_DRM_MSM_REGISTER_LOGGING=y

export CONFIG_QCOM_MDSS_PLL=y

export CONFIG_DRM_SDE_RSC=y

endif
 
export CONFIG_DISPLAY_BUILD=y

hdcp/Makefile

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



obj-$(CONFIG_HDCP_QSEECOM) += msm_hdcp.o \