diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-08 13:24:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-08 13:24:43 +0100 |
| commit | ed9d23700ee7847c354c0edd6d4da358bad48b7d (patch) | |
| tree | c6f164f4d3808b80999927b49553e4dc9fa80598 /drivers/gpu/drm/nouveau/core/subdev/mc/base.c | |
| parent | 72bce45fdecab65936f1e466c5c5107e48f8251e (diff) | |
| parent | bf06bec1f8b088965577b14eecaf532fe3ca1f58 (diff) | |
| download | juno-ed9d23700ee7847c354c0edd6d4da358bad48b7d.tar.gz | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/subdev/mc/base.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/mc/base.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/mc/base.c b/drivers/gpu/drm/nouveau/core/subdev/mc/base.c index 1c0330b8c9a..ec9cd6f10f9 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/mc/base.c +++ b/drivers/gpu/drm/nouveau/core/subdev/mc/base.c @@ -80,7 +80,9 @@ _nouveau_mc_dtor(struct nouveau_object *object) int nouveau_mc_create_(struct nouveau_object *parent, struct nouveau_object *engine, - struct nouveau_oclass *oclass, int length, void **pobject) + struct nouveau_oclass *oclass, + const struct nouveau_mc_intr *intr_map, + int length, void **pobject) { struct nouveau_device *device = nv_device(parent); struct nouveau_mc *pmc; @@ -92,6 +94,8 @@ nouveau_mc_create_(struct nouveau_object *parent, struct nouveau_object *engine, if (ret) return ret; + pmc->intr_map = intr_map; + ret = request_irq(device->pdev->irq, nouveau_mc_intr, IRQF_SHARED, "nouveau", pmc); if (ret < 0) |