aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2013-04-24 04:04:22 -0400
committerBen Skeggs <bskeggs@redhat.com>2013-04-26 01:38:08 -0400
commit2ecda48b36ecb4ec21d1d5ba7b8ccaa7ec701795 (patch)
tree56228ee67aee8ba781f47a29c6d90b9a3b4b269c
parentf50c805488ed7d937da51a29a37b0327bd116ee0 (diff)
drm/nv50-/disp: use self as parent for subobjects
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/disp/nv50.c3
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
index 608834449e52..6a38402fa56c 100644
--- a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
@@ -572,7 +572,8 @@ nv50_disp_base_ctor(struct nouveau_object *parent,
572 priv->base.vblank->priv = priv; 572 priv->base.vblank->priv = priv;
573 priv->base.vblank->enable = nv50_disp_base_vblank_enable; 573 priv->base.vblank->enable = nv50_disp_base_vblank_enable;
574 priv->base.vblank->disable = nv50_disp_base_vblank_disable; 574 priv->base.vblank->disable = nv50_disp_base_vblank_disable;
575 return nouveau_ramht_new(parent, parent, 0x1000, 0, &base->ramht); 575 return nouveau_ramht_new(nv_object(base), nv_object(base), 0x1000, 0,
576 &base->ramht);
576} 577}
577 578
578static void 579static void
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
index 788dd34ccb54..019eacd8a68f 100644
--- a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
@@ -473,7 +473,8 @@ nvd0_disp_base_ctor(struct nouveau_object *parent,
473 priv->base.vblank->enable = nvd0_disp_base_vblank_enable; 473 priv->base.vblank->enable = nvd0_disp_base_vblank_enable;
474 priv->base.vblank->disable = nvd0_disp_base_vblank_disable; 474 priv->base.vblank->disable = nvd0_disp_base_vblank_disable;
475 475
476 return nouveau_ramht_new(parent, parent, 0x1000, 0, &base->ramht); 476 return nouveau_ramht_new(nv_object(base), nv_object(base), 0x1000, 0,
477 &base->ramht);
477} 478}
478 479
479static void 480static void