Skip to content

Commit

Permalink
drm/gk104/ibus: increase various random timeouts
Browse files Browse the repository at this point in the history
Fixes (at least) PTHERM accesses timing out at higher clock speeds.

Values and registers taken from what the binary driver does.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  • Loading branch information
Ben Skeggs committed Jun 17, 2014
1 parent 1968a1e commit 0892a5f
Showing 1 changed file with 18 additions and 1 deletion.
19 changes: 18 additions & 1 deletion drivers/gpu/drm/nouveau/core/subdev/ibus/nve0.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,23 @@ nve0_ibus_intr(struct nouveau_subdev *subdev)
}
}

static int
nve0_ibus_init(struct nouveau_object *object)
{
struct nve0_ibus_priv *priv = (void *)object;
int ret = nouveau_ibus_init(&priv->base);
if (ret == 0) {
nv_mask(priv, 0x122318, 0x0003ffff, 0x00001000);
nv_mask(priv, 0x12231c, 0x0003ffff, 0x00000200);
nv_mask(priv, 0x122310, 0x0003ffff, 0x00000800);
nv_mask(priv, 0x122348, 0x0003ffff, 0x00000100);
nv_mask(priv, 0x1223b0, 0x0003ffff, 0x00000fff);
nv_mask(priv, 0x122348, 0x0003ffff, 0x00000200);
nv_mask(priv, 0x122358, 0x0003ffff, 0x00002880);
}
return ret;
}

static int
nve0_ibus_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
Expand All @@ -117,7 +134,7 @@ nve0_ibus_oclass = {
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nve0_ibus_ctor,
.dtor = _nouveau_ibus_dtor,
.init = _nouveau_ibus_init,
.init = nve0_ibus_init,
.fini = _nouveau_ibus_fini,
},
};

0 comments on commit 0892a5f

Please sign in to comment.