From 43872b6aaac3292ecfa5dcfbf9965b62c84a3a62 Mon Sep 17 00:00:00 2001 From: "joyce.ooi" Date: Mon, 20 Mar 2023 11:20:13 +0800 Subject: [PATCH 1/2] gpu: drm: img: disable PDUMP PDUMP is disabled to improve performance of GPU as PDUMP is used for debugging purposes. Signed-off-by: joyce.ooi --- drivers/gpu/drm/img/img-rogue/Makefile | 2 +- drivers/gpu/drm/img/img-rogue/config_kernel.h | 4 ++-- drivers/gpu/drm/img/img-rogue/config_kernel.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/img/img-rogue/Makefile b/drivers/gpu/drm/img/img-rogue/Makefile index 5c7f4ea6cb5c..ee37ef8cadbf 100755 --- a/drivers/gpu/drm/img/img-rogue/Makefile +++ b/drivers/gpu/drm/img/img-rogue/Makefile @@ -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 diff --git a/drivers/gpu/drm/img/img-rogue/config_kernel.h b/drivers/gpu/drm/img/img-rogue/config_kernel.h index 3207aaf3f97c..4d96b6b88e6a 100644 --- a/drivers/gpu/drm/img/img-rogue/config_kernel.h +++ b/drivers/gpu/drm/img/img-rogue/config_kernel.h @@ -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 diff --git a/drivers/gpu/drm/img/img-rogue/config_kernel.mk b/drivers/gpu/drm/img/img-rogue/config_kernel.mk index 4e9344b2dec1..503847443a33 100644 --- a/drivers/gpu/drm/img/img-rogue/config_kernel.mk +++ b/drivers/gpu/drm/img/img-rogue/config_kernel.mk @@ -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 From cc2e15b31bde41a39a8dd62d205255f0d0731be1 Mon Sep 17 00:00:00 2001 From: "keith.zhao" Date: Wed, 22 Mar 2023 13:45:00 +0800 Subject: [PATCH 2/2] display: 510-kernel fail to start base on new uboot when uboot display logo , kernel need to avoid handle the interrupt at the begining Signed-off-by: keith --- drivers/gpu/drm/verisilicon/vs_dc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) mode change 100755 => 100644 drivers/gpu/drm/verisilicon/vs_dc.c diff --git a/drivers/gpu/drm/verisilicon/vs_dc.c b/drivers/gpu/drm/verisilicon/vs_dc.c old mode 100755 new mode 100644 index 3fffa66ca137..394db9f679fe --- a/drivers/gpu/drm/verisilicon/vs_dc.c +++ b/drivers/gpu/drm/verisilicon/vs_dc.c @@ -1353,7 +1353,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++)