Re: [PATCH] drm/radeon: let's use GB for vm_size

[Christian König <deathsimple@xxxxxxxxxxx>]

Am 18.07.2014 19:06, schrieb Alex Deucher:
> On Fri, Jul 18, 2014 at 12:10 PM, Alex Deucher <alexdeucher@xxxxxxxxx> wrote:
> > On Fri, Jul 18, 2014 at 7:56 AM, Christian König
> > <deathsimple@xxxxxxxxxxx> wrote:
> > > From: Christian König <christian.koenig@xxxxxxx>
> > >
> > > VM sizes smaller than 1GB doesn't make much sense anyway.
> > >
> > > Signed-off-by: Christian König <christian.koenig@xxxxxxx>
> > Applied to my 3.16 tree.
> Actually there was a small typo.  I applied the attached version instead.

Still looks good to me.

Thanks for getting it into 3.16,
Christian.

> Alex
>
> > Alex
> >
> > > ---
> > >   drivers/gpu/drm/radeon/radeon_device.c | 14 +++++++-------
> > >   drivers/gpu/drm/radeon/radeon_drv.c    |  4 ++--
> > >   2 files changed, 9 insertions(+), 9 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
> > > index 03686fa..a8537d7 100644
> > > --- a/drivers/gpu/drm/radeon/radeon_device.c
> > > +++ b/drivers/gpu/drm/radeon/radeon_device.c
> > > @@ -1056,22 +1056,22 @@ static void radeon_check_arguments(struct radeon_device *rdev)
> > >          if (!radeon_check_pot_argument(radeon_vm_size)) {
> > >                  dev_warn(rdev->dev, "VM size (%d) must be a power of 2\n",
> > >                           radeon_vm_size);
> > > -               radeon_vm_size = 4096;
> > > +               radeon_vm_size = 4;
> > >          }
> > >
> > > -       if (radeon_vm_size < 4) {
> > > -               dev_warn(rdev->dev, "VM size (%d) to small, min is 4MB\n",
> > > +       if (radeon_vm_size < 1) {
> > > +               dev_warn(rdev->dev, "VM size (%d) to small, min is 1GB\n",
> > >                           radeon_vm_size);
> > > -               radeon_vm_size = 4096;
> > > +               radeon_vm_size = 4;
> > >          }
> > >
> > >          /*
> > >           * Max GPUVM size for Cayman, SI and CI are 40 bits.
> > >           */
> > > -       if (radeon_vm_size > 1024*1024) {
> > > +       if (radeon_vm_size > 1024) {
> > >                  dev_warn(rdev->dev, "VM size (%d) to large, max is 1TB\n",
> > >                           radeon_vm_size);
> > > -               radeon_vm_size = 4096;
> > > +               radeon_vm_size = 4;
> > >          }
> > >
> > >          /* defines number of bits in page table versus page directory,
> > > @@ -1238,7 +1238,7 @@ int radeon_device_init(struct radeon_device *rdev,
> > >          /* Adjust VM size here.
> > >           * Max GPUVM size for cayman+ is 40 bits.
> > >           */
> > > -       rdev->vm_manager.max_pfn = radeon_vm_size << 8;
> > > +       rdev->vm_manager.max_pfn = radeon_vm_size << 18;
> > >
> > >          /* Set asic functions */
> > >          r = radeon_asic_init(rdev);
> > > diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
> > > index cb14213..e9e3610 100644
> > > --- a/drivers/gpu/drm/radeon/radeon_drv.c
> > > +++ b/drivers/gpu/drm/radeon/radeon_drv.c
> > > @@ -173,7 +173,7 @@ int radeon_dpm = -1;
> > >   int radeon_aspm = -1;
> > >   int radeon_runtime_pm = -1;
> > >   int radeon_hard_reset = 0;
> > > -int radeon_vm_size = 4096;
> > > +int radeon_vm_size = 4;
> > >   int radeon_vm_block_size = 9;
> > >   int radeon_deep_color = 0;
> > >
> > > @@ -243,7 +243,7 @@ module_param_named(runpm, radeon_runtime_pm, int, 0444);
> > >   MODULE_PARM_DESC(hard_reset, "PCI config reset (1 = force enable, 0 = disable (default))");
> > >   module_param_named(hard_reset, radeon_hard_reset, int, 0444);
> > >
> > > -MODULE_PARM_DESC(vm_size, "VM address space size in megabytes (default 4GB)");
> > > +MODULE_PARM_DESC(vm_size, "VM address space size in gigabytes (default 4GB)");
> > >   module_param_named(vm_size, radeon_vm_size, int, 0444);
> > >
> > >   MODULE_PARM_DESC(vm_block_size, "VM page table size in bits (default 9)");
> > > --
> > > 1.9.1

_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel