Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

msm: kgsl: Allow pagefault policy to be controlled by userspace

Browse source 
GPU pagefault policy can be set to below options:
   a) enable/disable GPU HALT on pagefaults
   b) log only one pagefault per page.
GPU pagefault policy can be controled using panel file
and debugfs.

Change-Id: I0613e0d087fc45eb5e519e1c834a33f32376672f
Signed-off-by: Tarun Karra <tkarra@codeaurora.org>
This commit is contained in:
Tarun Karra 2013-02-13 13:57:25 -08:00 committed by Iliyan Malchev
parent e931294bec
commit 87b110ff63
5 changed files with 40 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gpu/msm/adreno.c
View file

@ -2245,6 +2245,12 @@ static int adreno_setproperty(struct kgsl_device *device,
else
adreno_dev->ft_policy = KGSL_FT_DEFAULT_POLICY;
if (ftd.ft_pf_policy)
adreno_dev->ft_pf_policy = ftd.ft_policy;
else
adreno_dev->ft_pf_policy =
KGSL_FT_PAGEFAULT_DEFAULT_POLICY;
if (ftd.ft_pm_dump)
device->pm_dump_enable = 1;
else

1
drivers/gpu/msm/adreno.h
View file

@ -106,6 +106,7 @@ struct adreno_device {
unsigned int long_ib_detect;
unsigned int long_ib;
unsigned int long_ib_ts;
unsigned int ft_pf_policy;
unsigned int gpulist_index;
struct ocmem_buf *ocmem_hdl;
unsigned int ocmem_base;

17
drivers/gpu/msm/adreno_debugfs.c
View file

@ -73,10 +73,25 @@ void adreno_debugfs_init(struct kgsl_device *device)
* by default set FT policy to KGSL_FT_DEFAULT_POLICY
*/
adreno_dev->ft_policy = KGSL_FT_DEFAULT_POLICY;
debugfs_create_u32("fault_tolerance_policy", 0644, device->d_debugfs,
debugfs_create_u32("ft_policy", 0644, device->d_debugfs,
&adreno_dev->ft_policy);
/* By default enable long IB detection */
adreno_dev->long_ib_detect = 1;
debugfs_create_u32("long_ib_detect", 0644, device->d_debugfs,
&adreno_dev->long_ib_detect);
/*
* FT pagefault policy can be set to any of the options below.
* KGSL_FT_PAGEFAULT_INT_ENABLE -> BIT(0) set to enable pagefault INT
* KGSL_FT_PAGEFAULT_GPUHALT_ENABLE -> BIT(1) Set to enable GPU HALT on
* pagefaults. This stalls the GPU on a pagefault on IOMMU v1 HW.
* KGSL_FT_PAGEFAULT_LOG_ONE_PER_PAGE -> BIT(2) Set to log only one
* pagefault per page.
* KGSL_FT_PAGEFAULT_LOG_ONE_PER_INT -> BIT(3) Set to log only one
* pagefault per INT.
*/
adreno_dev->ft_pf_policy = KGSL_FT_PAGEFAULT_DEFAULT_POLICY;
debugfs_create_u32("ft_pagefault_policy", 0644, device->d_debugfs,
&adreno_dev->ft_pf_policy);
}

10
drivers/gpu/msm/kgsl_iommu.c
View file

@ -110,7 +110,8 @@ static int kgsl_iommu_fault_handler(struct iommu_domain *domain,
struct kgsl_iommu_device *iommu_dev;
unsigned int ptbase, fsr;
struct kgsl_device *device;
unsigned int no_page_fault_log;
struct adreno_device *adreno_dev;
unsigned int no_page_fault_log = 0;
ret = get_iommu_unit(dev, &mmu, &iommu_unit);
if (ret)
@ -123,6 +124,7 @@ static int kgsl_iommu_fault_handler(struct iommu_domain *domain,
}
iommu = mmu->priv;
device = mmu->device;
adreno_dev = ADRENO_DEVICE(device);
ptbase = KGSL_IOMMU_GET_CTX_REG(iommu, iommu_unit,
iommu_dev->ctx_id, TTBR0);
@ -130,7 +132,8 @@ static int kgsl_iommu_fault_handler(struct iommu_domain *domain,
fsr = KGSL_IOMMU_GET_CTX_REG(iommu, iommu_unit,
iommu_dev->ctx_id, FSR);
no_page_fault_log = kgsl_mmu_log_fault_addr(mmu, ptbase, addr);
if (adreno_dev->ft_pf_policy & KGSL_FT_PAGEFAULT_LOG_ONE_PER_PAGE)
no_page_fault_log = kgsl_mmu_log_fault_addr(mmu, ptbase, addr);
if (!no_page_fault_log) {
KGSL_MEM_CRIT(iommu_dev->kgsldev,
@ -152,7 +155,8 @@ static int kgsl_iommu_fault_handler(struct iommu_domain *domain,
* the GPU and trigger a snapshot. To stall the transaction return
* EBUSY error.
*/
ret = -EBUSY;
if (adreno_dev->ft_pf_policy & KGSL_FT_PAGEFAULT_GPUHALT_ENABLE)
ret = -EBUSY;
done:
return ret;
}

11
include/linux/msm_kgsl.h
View file

@ -175,9 +175,18 @@ enum kgsl_property_type {
#define KGSL_FT_SKIPFRAME 0x00000008
#define KGSL_FT_DEFAULT_POLICY (KGSL_FT_REPLAY + KGSL_FT_SKIPIB)
/* Pagefault policy flags */
#define KGSL_FT_PAGEFAULT_INT_ENABLE 0x00000001
#define KGSL_FT_PAGEFAULT_GPUHALT_ENABLE 0x00000002
#define KGSL_FT_PAGEFAULT_LOG_ONE_PER_PAGE 0x00000004
#define KGSL_FT_PAGEFAULT_LOG_ONE_PER_INT 0x00000008
#define KGSL_FT_PAGEFAULT_DEFAULT_POLICY (KGSL_FT_PAGEFAULT_INT_ENABLE + \
KGSL_FT_PAGEFAULT_LOG_ONE_PER_PAGE)
/* Fault tolerance config */
struct kgsl_ft_config {
unsigned int ft_policy; /* GPU fault tolerance policy flags */
unsigned int ft_policy; /* Fault Tolerance policy flags */
unsigned int ft_pf_policy; /* Pagefault policy flags */
unsigned int ft_pm_dump; /* KGSL enable postmortem dump */
unsigned int ft_detect_ms;
unsigned int ft_dos_timeout_ms;