drm/nouveau/bar: behave better if ioremap failed
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
e715396ae3
commit
e7d96929a7
|
@ -99,8 +99,13 @@ nouveau_bar_alloc(struct nouveau_bar *bar, struct nouveau_object *parent,
|
||||||
struct nouveau_mem *mem, struct nouveau_object **pobject)
|
struct nouveau_mem *mem, struct nouveau_object **pobject)
|
||||||
{
|
{
|
||||||
struct nouveau_object *engine = nv_object(bar);
|
struct nouveau_object *engine = nv_object(bar);
|
||||||
return nouveau_object_ctor(parent, engine, &nouveau_barobj_oclass,
|
int ret = -ENOMEM;
|
||||||
mem, 0, pobject);
|
if (bar->iomem) {
|
||||||
|
ret = nouveau_object_ctor(parent, engine,
|
||||||
|
&nouveau_barobj_oclass,
|
||||||
|
mem, 0, pobject);
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
@ -118,9 +123,12 @@ nouveau_bar_create_(struct nouveau_object *parent,
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
if (nv_device_resource_len(device, 3) != 0)
|
if (nv_device_resource_len(device, 3) != 0) {
|
||||||
bar->iomem = ioremap(nv_device_resource_start(device, 3),
|
bar->iomem = ioremap(nv_device_resource_start(device, 3),
|
||||||
nv_device_resource_len(device, 3));
|
nv_device_resource_len(device, 3));
|
||||||
|
if (!bar->iomem)
|
||||||
|
nv_warn(bar, "PRAMIN ioremap failed\n");
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue