Am 21.04.2017 um 10:43 schrieb Chunming Zhou: > v2: address Alex's comment, add AMDGPU_DEFAULT_GTT_SIZE_MB. > > Change-Id: I0417651a8e6fd23b28f9b30a110a196c332e2d03 > Signed-off-by: Chunming Zhou <David1.Zhou at amd.com> Reviewed-by: Christian König <christian.koenig at amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + > drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 3 ++- > drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 3 ++- > drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 3 ++- > drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 3 ++- > 5 files changed, 9 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index 8ab080a..501d6ea 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -114,6 +114,7 @@ > extern int amdgpu_cntl_sb_buf_per_se; > extern int amdgpu_param_buf_per_se; > > +#define AMDGPU_DEFAULT_GTT_SIZE_MB 3072ULL /* 3GB by default */ > #define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS 3000 > #define AMDGPU_MAX_USEC_TIMEOUT 100000 /* 100 ms */ > #define AMDGPU_FENCE_JIFFIES_TIMEOUT (HZ / 2) > diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c > index 0ce0d0a..480368b 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c > @@ -346,7 +346,8 @@ static int gmc_v6_0_mc_init(struct amdgpu_device *adev) > * size equal to the 1024 or vram, whichever is larger. > */ > if (amdgpu_gart_size == -1) > - adev->mc.gtt_size = max((1024ULL << 20), adev->mc.mc_vram_size); > + adev->mc.gtt_size = max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20), > + adev->mc.mc_vram_size); > else > adev->mc.gtt_size = (uint64_t)amdgpu_gart_size << 20; > > diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c > index f90dba5..715f605 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c > @@ -392,7 +392,8 @@ static int gmc_v7_0_mc_init(struct amdgpu_device *adev) > * size equal to the 1024 or vram, whichever is larger. > */ > if (amdgpu_gart_size == -1) > - adev->mc.gtt_size = max((1024ULL << 20), adev->mc.mc_vram_size); > + adev->mc.gtt_size = max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20), > + adev->mc.mc_vram_size); > else > adev->mc.gtt_size = (uint64_t)amdgpu_gart_size << 20; > > diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c > index fe79328..d0e7510 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c > @@ -484,7 +484,8 @@ static int gmc_v8_0_mc_init(struct amdgpu_device *adev) > * size equal to the 1024 or vram, whichever is larger. > */ > if (amdgpu_gart_size == -1) > - adev->mc.gtt_size = max((1024ULL << 20), adev->mc.mc_vram_size); > + adev->mc.gtt_size = max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20), > + adev->mc.mc_vram_size); > else > adev->mc.gtt_size = (uint64_t)amdgpu_gart_size << 20; > > diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c > index 2d7a0e2..6ad0b87 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c > @@ -463,7 +463,8 @@ static int gmc_v9_0_mc_init(struct amdgpu_device *adev) > * size equal to the 1024 or vram, whichever is larger. > */ > if (amdgpu_gart_size == -1) > - adev->mc.gtt_size = max((1024ULL << 20), adev->mc.mc_vram_size); > + adev->mc.gtt_size = max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20), > + adev->mc.mc_vram_size); > else > adev->mc.gtt_size = (uint64_t)amdgpu_gart_size << 20; >
