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

Commit 57e4f336 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 630d896e on remote branch 

Change-Id: Id75643e3b343c291060e497998fd907d5f711f3b
parents 92126dc0 630d896e

Makefile

+8 −0
Original line number Diff line number Diff line
@@ -50,4 +50,12 @@ ifeq ($(CONFIG_ARCH_BENGAL), y) 
LINUXINCLUDE    += -include $(srctree)/techpack/display/config/bengaldispconf.h

endif



ifeq ($(CONFIG_ARCH_MONACO), y)

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

endif



ifeq ($(CONFIG_ARCH_MONACO), y)

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

endif



obj-$(CONFIG_DRM_MSM) += msm/

config/gki_holidisp.conf

+1 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

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

# Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.



export CONFIG_DRM_MSM=y

export CONFIG_DRM_MSM_SDE=y
@@ -15,4 +15,3 @@ export CONFIG_DRM_SDE_RSC=n 
export CONFIG_DISPLAY_BUILD=m

export CONFIG_MSM_SDE_ROTATOR=y

export CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y
 
export CONFIG_MSM_SDE_ROTATOR_INIT_ONLY=y

config/gki_holidispconf.h

+1 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

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

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

 */



#define CONFIG_DRM_MSM 1
@@ -14,4 +14,3 @@ 
#define CONFIG_GKI_DISPLAY 1

#define CONFIG_MSM_SDE_ROTATOR 1

#define CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG 1
 
#define CONFIG_MSM_SDE_ROTATOR_INIT_ONLY 1

config/monacodisp.conf

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

# Copyright (c) 2021, The Linux Foundation. All rights reserved.



export CONFIG_DRM_MSM=y

export CONFIG_DRM_MSM_SDE=y

export CONFIG_SYNC_FILE=y

export CONFIG_DRM_MSM_DSI=y

export CONFIG_DSI_PARSER=y

export CONFIG_DRM_SDE_WB=n

export CONFIG_DRM_MSM_REGISTER_LOGGING=y

export CONFIG_QCOM_MDSS_PLL=y

export CONFIG_MSM_SDE_ROTATOR=n

export CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=n

export CONFIG_DRM_SDE_RSC=n

export CONFIG_DISPLAY_BUILD=y

config/monacodispconf.h

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

/*

 * Copyright (c) 2021, 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_DSI_PARSER 1

#define CONFIG_DRM_MSM_REGISTER_LOGGING 1

#define CONFIG_QCOM_MDSS_PLL 1