Merge tag 'JH7110_510_SDK_v4.5.3' into vf2-510-devel

version JH7110_510_SDK_v4.5.3 for JH7110 EVB board

1. #4265: linux: fix issue that 5.10 kernel fail to boot base on new uboot
2. #4142: linux: IMG GPU disable pdump in kernel space
This commit is contained in:
Andy Hu 2023-03-22 16:29:36 +08:00
commit 111b26cfa2
4 changed files with 8 additions and 5 deletions

View file

@ -61,7 +61,7 @@ TARGET_PRIMARY_ARCH=target_riscv64
PVR_ARCH=rogue
PVR_ARCH_DEFS=rogue
PVR_SYSTEM := sf_7110
PDUMP ?= 1
#PDUMP ?= 1
BUILD ?= release
RGX_BVNC ?= 36.50.54.182
RGX_BNC ?= 36.50.54.182

View file

@ -12,7 +12,7 @@
#define RELEASE
#define RGX_BVNC_CORE_KM_HEADER "cores/rgxcore_km_36.50.54.182.h"
#define RGX_BNC_CONFIG_KM_HEADER "configs/rgxconfig_km_36.V.54.182.h"
#define PDUMP
//#define PDUMP
#define PVRSRV_NEED_PVR_DPF
#define PVRSRV_NEED_PVR_ASSERT
#define SUPPORT_RGXTQ_BRIDGE
@ -116,7 +116,7 @@
#define PVR_GPIO_MODE PVR_GPIO_MODE_GENERAL
#define PVRSRV_ENABLE_PROCESS_STATS
#define SUPPORT_USC_BREAKPOINT
#define SUPPORT_TBI_INTERFACE
//#define SUPPORT_TBI_INTERFACE
#define SUPPORT_AGP
#define RGXFW_SAFETY_WATCHDOG_PERIOD_IN_US 1000000
#define PVR_ANNOTATION_MAX_LEN 96

View file

@ -32,7 +32,7 @@ override SUPPORT_MIPS_64K_PAGE_SIZE :=
override RGX_NUM_OS_SUPPORTED := 1
override VMM_TYPE := stub
override SUPPORT_POWMON_COMPONENT := 1
override PDUMP := 1
#override PDUMP := 1
override RGX_TIMECORR_CLOCK := mono
override PDVFS_COM_HOST := 1
override PDVFS_COM_AP := 2

5
drivers/gpu/drm/verisilicon/vs_dc.c Executable file → Normal file
View file

@ -1352,7 +1352,10 @@ static irqreturn_t dc_isr(int irq, void *data)
struct vs_dc *dc = data;
struct vs_dc_info *dc_info = dc->hw.info;
u32 i, ret;
if(!dc_info)
return IRQ_HANDLED;
ret = dc_hw_get_interrupt(&dc->hw);
for (i = 0; i < dc_info->panel_num; i++)