drm/msm/adreno: Allow larger address space size
Subsystems (4)
PATCH v2 1/1 drm/msm/adreno: Allow larger address space size
From: Rob Clark <[email protected]>
The restriction to 4G was strictly to work around 64b math bug in some versions of SQE firmware. This appears to be fixed in a650+ SQE fw, so allow a larger address space size on these devices.
Also, add a modparam override for debugging and igt.
v2: Send the right version of the patch (ie. the one that actually
compiles)
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 3 ++- drivers/gpu/drm/msm/adreno/adreno_device.c | 3 +++ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 17 +++++++++++++++++ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 2 ++ 4 files changed, 24 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +2 -1
@@ -1737,7 +1737,8 @@ a6xx_create_private_address_space(struct msm_gpu *gpu)return ERR_CAST (mmu);return msm_gem_address_space_create (mmu, -"gpu" ,0x100000000ULL ,SZ_4G ); +"gpu" ,0x100000000ULL , +adreno_private_address_space_size (gpu)); }static uint32_t a6xx_get_rptr (struct msm_gpu *gpu,struct msm_ringbuffer *ring)
drivers/gpu/drm/msm/adreno/adreno_device.c +3 -0
@@ -303,6 +303,7 @@ static const struct adreno_info gpulist[] = { .init = a6xx_gpu_init, .zapfw = "a650_zap.mdt", .hwcg = a650_hwcg, + .address_space_size = SZ_16G, }, { .rev = ADRENO_REV(6, 6, 0, ANY_ID), .revn = 660,
@@ -316,6 +317,7 @@ static const struct adreno_info gpulist[] = { .init = a6xx_gpu_init, .zapfw = "a660_zap.mdt", .hwcg = a660_hwcg, + .address_space_size = SZ_16G, }, { .rev = ADRENO_REV(6, 3, 5, ANY_ID), .fw = {
@@ -326,6 +328,7 @@ static const struct adreno_info gpulist[] = { .inactive_period = DRM_MSM_INACTIVE_PERIOD, .init = a6xx_gpu_init, .hwcg = a660_hwcg, + .address_space_size = SZ_16G, }, { .rev = ADRENO_REV(6, 8, 0, ANY_ID), .revn = 680,
drivers/gpu/drm/msm/adreno/adreno_gpu.c +17 -0
@@ -21,6 +21,10 @@#include "msm_gem.h" #include "msm_mmu.h" +static u64 address_space_size =0 ; +MODULE_PARM_DESC (address_space_size,"Override for size of processes private GPU address space" ); +module_param (address_space_size, ullong,0600 ); +static bool zap_available = true; static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname,
@@ -228,6 +232,19 @@ adreno_iommu_create_address_space(struct msm_gpu *gpu,return aspace; } +u64 adreno_private_address_space_size (struct msm_gpu *gpu) +{ +struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu); + +if (address_space_size) +return address_space_size; + +if (adreno_gpu->info->address_space_size) +return adreno_gpu->info->address_space_size; + +return SZ_4G ; +} +int adreno_get_param (struct msm_gpu *gpu,struct msm_file_private *ctx,uint32_t param,uint64_t *value,uint32_t *len) {
drivers/gpu/drm/msm/adreno/adreno_gpu.h +2 -0
@@ -70,6 +70,7 @@ struct adreno_info {const char *zapfw;u32 inactive_period;const struct adreno_reglist *hwcg; +u64 address_space_size; };const struct adreno_info *adreno_info (struct adreno_rev rev);
@@ -280,6 +281,7 @@ static inline int adreno_is_a650_family(struct adreno_gpu *gpu)adreno_is_a660_family (gpu); } +u64 adreno_private_address_space_size (struct msm_gpu *gpu);int adreno_get_param (struct msm_gpu *gpu,struct msm_file_private *ctx,uint32_t param,uint64_t *value,uint32_t *len); int adreno_set_param(struct msm_gpu *gpu, struct msm_file_private *ctx,
Signature · 1 line
2.35.3
Quoted 7 lines · Rob Clark
From: Rob Clark <[email protected]>
The restriction to 4G was strictly to work around 64b math bug in some versions of SQE firmware. This appears to be fixed in a650+ SQE fw, so allow a larger address space size on these devices.
Quoted 6 lines
Also, add a modparam override for debugging and igt.
v2: Send the right version of the patch (ie. the one that actually
compiles)Signed-off-by Rob Clark <[email protected]>