feat(tc): support full-HD resolution for the FVP model

Enable full-HD resolution (1920x1080p60) for the FVP model, and add
checking for the passed resolution parameter.

Change-Id: I5e37ae79b5ceac088a18d5acf00ff4a557bb56aa
Signed-off-by: Sergio Alves <sergio.dasilvalves@arm.com>
Signed-off-by: Leo Yan <leo.yan@arm.com>
This commit is contained in:
Sergio Alves 2023-12-06 15:24:44 +00:00 committed by Leo Yan
parent 842fe7113c
commit dd5bf9c5e2
2 changed files with 32 additions and 0 deletions

View file

@ -7,6 +7,23 @@
#define GIC_CTRL_ADDR 2c010000 #define GIC_CTRL_ADDR 2c010000
#define GIC_GICR_OFFSET 0x200000 #define GIC_GICR_OFFSET 0x200000
#define UART_OFFSET 0x1000 #define UART_OFFSET 0x1000
#ifdef TC_RESOLUTION_1920X1080P60
#define VENCODER_TIMING_CLK 148500000
#define VENCODER_TIMING \
clock-frequency = <VENCODER_TIMING_CLK>; \
hactive = <1920>; \
vactive = <1080>; \
hfront-porch = <88>; \
hback-porch = <148>; \
hsync-len = <44>; \
vfront-porch = <4>; \
vback-porch = <36>; \
vsync-len = <5>
#else /* TC_RESOLUTION_640X480P60 */
#define VENCODER_TIMING_CLK 25175000 #define VENCODER_TIMING_CLK 25175000
#define VENCODER_TIMING \ #define VENCODER_TIMING \
clock-frequency = <VENCODER_TIMING_CLK>; \ clock-frequency = <VENCODER_TIMING_CLK>; \
@ -19,6 +36,8 @@
vback-porch = <33>; \ vback-porch = <33>; \
vsync-len = <2> vsync-len = <2>
#endif
/ { / {
chosen { chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";

View file

@ -44,6 +44,18 @@ ifeq (${SPD},spmd)
CTX_INCLUDE_PAUTH_REGS := 1 CTX_INCLUDE_PAUTH_REGS := 1
endif endif
# TC RESOLUTION - LIST OF VALID OPTIONS (this impacts only FVP)
TC_RESOLUTION_OPTIONS := 640x480p60 \
1920x1080p60
# Set default to the 640x480p60 resolution mode
TC_RESOLUTION ?= $(firstword $(TC_RESOLUTION_OPTIONS))
# Check resolution option for FVP
ifneq ($(filter ${TARGET_FLAVOUR}, fvp),)
ifeq ($(filter ${TC_RESOLUTION}, ${TC_RESOLUTION_OPTIONS}),)
$(error TC_RESOLUTION is ${TC_RESOLUTION}, it must be: ${TC_RESOLUTION_OPTIONS})
endif
endif
ifneq ($(shell expr $(TARGET_PLATFORM) \<= 1), 0) ifneq ($(shell expr $(TARGET_PLATFORM) \<= 1), 0)
$(warning Platform ${PLAT}$(TARGET_PLATFORM) is deprecated. \ $(warning Platform ${PLAT}$(TARGET_PLATFORM) is deprecated. \
@ -61,6 +73,7 @@ endif
$(eval $(call add_defines, \ $(eval $(call add_defines, \
TARGET_PLATFORM \ TARGET_PLATFORM \
TARGET_FLAVOUR_$(call uppercase,${TARGET_FLAVOUR}) \ TARGET_FLAVOUR_$(call uppercase,${TARGET_FLAVOUR}) \
TC_RESOLUTION_$(call uppercase,${TC_RESOLUTION}) \
TC_DPU_USE_SCMI_CLK \ TC_DPU_USE_SCMI_CLK \
TC_SCMI_PD_CTRL_EN \ TC_SCMI_PD_CTRL_EN \
TC_IOMMU_EN \ TC_IOMMU_EN \