| Message ID | 1395650554-31925-4-git-send-email-acourbot@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Mar 24, 2014 at 05:42:25PM +0900, Alexandre Courbot wrote: > Some chips that use system memory exclusively (e.g. GK20A) do not > expose 2 BAR regions. For them only BAR1 exists, and it should be used > for USERD mapping. Do not map BAR3 if its resource does not exist. > > Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> > --- > drivers/gpu/drm/nouveau/core/subdev/bar/base.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/core/subdev/bar/base.c b/drivers/gpu/drm/nouveau/core/subdev/bar/base.c > index bdf594116f3f..d713eeb75b13 100644 > --- a/drivers/gpu/drm/nouveau/core/subdev/bar/base.c > +++ b/drivers/gpu/drm/nouveau/core/subdev/bar/base.c > @@ -110,6 +110,7 @@ nouveau_bar_create_(struct nouveau_object *parent, > { > struct nouveau_device *device = nv_device(parent); > struct nouveau_bar *bar; > + bool has_bar3 = nv_device_resource_len(device, 3) != 0; I don't think this variable is really necessary since you only use the expression once anyway, but I don't feel very strongly about it, so either way: Reviewed-by: Thierry Reding <treding@nvidia.com>
On Tue, Mar 25, 2014 at 8:13 AM, Thierry Reding <thierry.reding@gmail.com> wrote: > On Mon, Mar 24, 2014 at 05:42:25PM +0900, Alexandre Courbot wrote: >> Some chips that use system memory exclusively (e.g. GK20A) do not >> expose 2 BAR regions. For them only BAR1 exists, and it should be used >> for USERD mapping. Do not map BAR3 if its resource does not exist. >> >> Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> >> --- >> drivers/gpu/drm/nouveau/core/subdev/bar/base.c | 7 +++++-- >> 1 file changed, 5 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/nouveau/core/subdev/bar/base.c b/drivers/gpu/drm/nouveau/core/subdev/bar/base.c >> index bdf594116f3f..d713eeb75b13 100644 >> --- a/drivers/gpu/drm/nouveau/core/subdev/bar/base.c >> +++ b/drivers/gpu/drm/nouveau/core/subdev/bar/base.c >> @@ -110,6 +110,7 @@ nouveau_bar_create_(struct nouveau_object *parent, >> { >> struct nouveau_device *device = nv_device(parent); >> struct nouveau_bar *bar; >> + bool has_bar3 = nv_device_resource_len(device, 3) != 0; > > I don't think this variable is really necessary since you only use the > expression once anyway, but I don't feel very strongly about it, so > either way: I'd also prefer it folded in, but it's not a big deal. A couple of other upcoming comments will require a re-spin anyway, so we may as well :) > > Reviewed-by: Thierry Reding <treding@nvidia.com> > > _______________________________________________ > Nouveau mailing list > Nouveau@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/nouveau >
diff --git a/drivers/gpu/drm/nouveau/core/subdev/bar/base.c b/drivers/gpu/drm/nouveau/core/subdev/bar/base.c index bdf594116f3f..d713eeb75b13 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/bar/base.c +++ b/drivers/gpu/drm/nouveau/core/subdev/bar/base.c @@ -110,6 +110,7 @@ nouveau_bar_create_(struct nouveau_object *parent, { struct nouveau_device *device = nv_device(parent); struct nouveau_bar *bar; + bool has_bar3 = nv_device_resource_len(device, 3) != 0; int ret; ret = nouveau_subdev_create_(parent, engine, oclass, 0, "BARCTL", @@ -118,8 +119,10 @@ nouveau_bar_create_(struct nouveau_object *parent, if (ret) return ret; - bar->iomem = ioremap(nv_device_resource_start(device, 3), - nv_device_resource_len(device, 3)); + if (has_bar3) + bar->iomem = ioremap(nv_device_resource_start(device, 3), + nv_device_resource_len(device, 3)); + return 0; }
Some chips that use system memory exclusively (e.g. GK20A) do not expose 2 BAR regions. For them only BAR1 exists, and it should be used for USERD mapping. Do not map BAR3 if its resource does not exist. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> --- drivers/gpu/drm/nouveau/core/subdev/bar/base.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)