summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/core/subdev/devinit
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>2013-06-27 07:35:53 (GMT)
committerBen Skeggs <bskeggs@redhat.com>2013-07-01 03:50:50 (GMT)
commit791dc143ed2c441f5202d8721609d94dce9fcf88 (patch)
tree216e356ae9c18704f345ec7b464af3c0050c21f8 /drivers/gpu/drm/nouveau/core/subdev/devinit
parente99716f13d3a499f95a17e5442ef39270e4fc38b (diff)
downloadlinux-fsl-qoriq-791dc143ed2c441f5202d8721609d94dce9fcf88.tar.xz
drm/nvd0-/disp: handle case where display engine is missing/disabled
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/subdev/devinit')
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/devinit/nvc0.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/devinit/nvc0.c b/drivers/gpu/drm/nouveau/core/subdev/devinit/nvc0.c
index dd78efb..af407a8 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/devinit/nvc0.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/devinit/nvc0.c
@@ -73,6 +73,8 @@ nvc0_devinit_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
return ret;
priv->base.pll_set = nvc0_devinit_pll_set;
+ if (nv_rd32(priv, 0x022500) & 0x00000001)
+ priv->base.post = true;
return 0;
}