From 9939cadeb559fa2450c7ae7a268423b57ace0998 Mon Sep 17 00:00:00 2001 From: liu_wei01 Date: Wed, 23 Mar 2022 16:13:10 +0800 Subject: [PATCH 1/7] add lcd hdf Signed-off-by: liu_wei01 --- model/display/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/model/display/Makefile b/model/display/Makefile index f4a808f..4caad3a 100644 --- a/model/display/Makefile +++ b/model/display/Makefile @@ -17,13 +17,13 @@ DISPLAY_ROOT_DIR = ../../../../../framework/model/display/driver ifeq ($(CONFIG_DRIVERS_HDF_DISP), y) obj-y += \ $(DISPLAY_ROOT_DIR)/hdf_disp.o \ - $(DISPLAY_ROOT_DIR)/backlight/hdf_bl.o + $(DISPLAY_ROOT_DIR)/backlight/hdf_bl.o \ + $(DISPLAY_ROOT_DIR)/hdf_drm_panel.o obj-$(CONFIG_DRIVERS_HDF_PLATFORM_PWM) += \ $(DISPLAY_ROOT_DIR)/backlight/pwm_bl.o obj-$(CONFIG_ARCH_SPRD) += \ - $(DISPLAY_ROOT_DIR)/hdf_drm_panel.o \ $(DISPLAY_ROOT_DIR)/panel/ili9881c_boe.o obj-$(CONFIG_ARCH_HI3516DV300) += \ @@ -36,6 +36,8 @@ obj-$(CONFIG_DRIVERS_HDF_LCD_ICN9700) += \ $(DISPLAY_ROOT_DIR)/panel/mipi_icn9700.o obj-$(CONFIG_DRIVERS_HDF_LCD_ST7789) += \ $(DISPLAY_ROOT_DIR)/panel/ssp_st7789.o +obj-$(CONFIG_ARCH_ROCKCHIP) += \ + $(DISPLAY_ROOT_DIR)/panel/mipi_dsi_panel_simple.o ccflags-y += -lm -lc -lgcc \ -I$(srctree)/drivers/hdf/framework/model/display/driver \ -- Gitee From 7f4132ae013ccf4e90b87ec82f3cd8216f18ac62 Mon Sep 17 00:00:00 2001 From: "leo.liu" <1092255140@qq.com> Date: Thu, 24 Mar 2022 08:18:57 +0000 Subject: [PATCH 2/7] Signed-off-by: liu_wei01 --- model/display/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/model/display/Makefile b/model/display/Makefile index 4caad3a..b3066c6 100644 --- a/model/display/Makefile +++ b/model/display/Makefile @@ -18,8 +18,9 @@ ifeq ($(CONFIG_DRIVERS_HDF_DISP), y) obj-y += \ $(DISPLAY_ROOT_DIR)/hdf_disp.o \ $(DISPLAY_ROOT_DIR)/backlight/hdf_bl.o \ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0) $(DISPLAY_ROOT_DIR)/hdf_drm_panel.o - +#endif obj-$(CONFIG_DRIVERS_HDF_PLATFORM_PWM) += \ $(DISPLAY_ROOT_DIR)/backlight/pwm_bl.o -- Gitee From e7f5b81e80162e1d8f976241bb5ccb97649ab5fc Mon Sep 17 00:00:00 2001 From: "leo.liu" <1092255140@qq.com> Date: Thu, 24 Mar 2022 08:39:46 +0000 Subject: [PATCH 3/7] Signed-off-by: liu_wei01 --- model/display/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/display/Makefile b/model/display/Makefile index b3066c6..26d3fcf 100644 --- a/model/display/Makefile +++ b/model/display/Makefile @@ -18,7 +18,7 @@ ifeq ($(CONFIG_DRIVERS_HDF_DISP), y) obj-y += \ $(DISPLAY_ROOT_DIR)/hdf_disp.o \ $(DISPLAY_ROOT_DIR)/backlight/hdf_bl.o \ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0) \ $(DISPLAY_ROOT_DIR)/hdf_drm_panel.o #endif obj-$(CONFIG_DRIVERS_HDF_PLATFORM_PWM) += \ -- Gitee From ec02e71bbf3027e0ee3bdd84e5e2a2afa0e3b628 Mon Sep 17 00:00:00 2001 From: "leo.liu" <1092255140@qq.com> Date: Thu, 24 Mar 2022 08:52:55 +0000 Subject: [PATCH 4/7] Signed-off-by: liu_wei01 --- model/display/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/model/display/Makefile b/model/display/Makefile index 26d3fcf..e1d2210 100644 --- a/model/display/Makefile +++ b/model/display/Makefile @@ -17,10 +17,12 @@ DISPLAY_ROOT_DIR = ../../../../../framework/model/display/driver ifeq ($(CONFIG_DRIVERS_HDF_DISP), y) obj-y += \ $(DISPLAY_ROOT_DIR)/hdf_disp.o \ - $(DISPLAY_ROOT_DIR)/backlight/hdf_bl.o \ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0) \ - $(DISPLAY_ROOT_DIR)/hdf_drm_panel.o + $(DISPLAY_ROOT_DIR)/backlight/hdf_bl.o + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)) +obj-y += $(DISPLAY_ROOT_DIR)/hdf_drm_panel.o #endif + obj-$(CONFIG_DRIVERS_HDF_PLATFORM_PWM) += \ $(DISPLAY_ROOT_DIR)/backlight/pwm_bl.o -- Gitee From 64d8c39a8984f8a929306442963e57432b550e3f Mon Sep 17 00:00:00 2001 From: "leo.liu" <1092255140@qq.com> Date: Thu, 31 Mar 2022 01:52:33 +0000 Subject: [PATCH 5/7] Signed-off-by: liu_wei01 --- model/display/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/model/display/Makefile b/model/display/Makefile index e1d2210..50e971b 100644 --- a/model/display/Makefile +++ b/model/display/Makefile @@ -19,10 +19,11 @@ obj-y += \ $(DISPLAY_ROOT_DIR)/hdf_disp.o \ $(DISPLAY_ROOT_DIR)/backlight/hdf_bl.o +ifeq ($(CONFIG_DRM), y) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)) obj-y += $(DISPLAY_ROOT_DIR)/hdf_drm_panel.o #endif - +#endif obj-$(CONFIG_DRIVERS_HDF_PLATFORM_PWM) += \ $(DISPLAY_ROOT_DIR)/backlight/pwm_bl.o -- Gitee From 7d951999b62092daa76cc27618557aad3995be8b Mon Sep 17 00:00:00 2001 From: "leo.liu" <1092255140@qq.com> Date: Thu, 31 Mar 2022 02:20:23 +0000 Subject: [PATCH 6/7] Signed-off-by: liu_wei01 --- model/display/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/display/Makefile b/model/display/Makefile index 50e971b..ce9a379 100644 --- a/model/display/Makefile +++ b/model/display/Makefile @@ -23,7 +23,7 @@ ifeq ($(CONFIG_DRM), y) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)) obj-y += $(DISPLAY_ROOT_DIR)/hdf_drm_panel.o #endif -#endif +endif obj-$(CONFIG_DRIVERS_HDF_PLATFORM_PWM) += \ $(DISPLAY_ROOT_DIR)/backlight/pwm_bl.o -- Gitee From 5585485dccb76458ea184fb5a13d999da47dbfe1 Mon Sep 17 00:00:00 2001 From: "leo.liu" <1092255140@qq.com> Date: Thu, 31 Mar 2022 03:13:19 +0000 Subject: [PATCH 7/7] Signed-off-by: liu_wei01 --- model/display/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/display/Makefile b/model/display/Makefile index ce9a379..6b43119 100644 --- a/model/display/Makefile +++ b/model/display/Makefile @@ -19,7 +19,7 @@ obj-y += \ $(DISPLAY_ROOT_DIR)/hdf_disp.o \ $(DISPLAY_ROOT_DIR)/backlight/hdf_bl.o -ifeq ($(CONFIG_DRM), y) +ifeq ($(CONFIG_DRM)$(CONFIG_DRM_MIPI_DSI)$(CONFIG_DRM_PANEL), y) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)) obj-y += $(DISPLAY_ROOT_DIR)/hdf_drm_panel.o #endif -- Gitee