diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-01-22 12:58:12 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-01-23 13:39:18 +1000 |
| commit | 2332b31116d5500d05173b2a7aaa95ba15d7983a (patch) | |
| tree | 0c9280cc0440b64905f3a9b10587881bc696c58f /drivers/gpu/drm/nouveau/dispnv04 | |
| parent | ea7dce90105ff2eb81958498d6d9f30a0753bbe8 (diff) | |
| download | op-kernel-dev-2332b31116d5500d05173b2a7aaa95ba15d7983a.zip op-kernel-dev-2332b31116d5500d05173b2a7aaa95ba15d7983a.tar.gz | |
drm/nouveau: create base display from common code
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv04')
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv04/disp.c | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv04/disp.h | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv04/disp.c b/drivers/gpu/drm/nouveau/dispnv04/disp.c index b13ff0f..2f1ed61 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv04/disp.c @@ -77,11 +77,6 @@ nv04_display_create(struct drm_device *dev) nouveau_hw_save_vga_fonts(dev, 1); - ret = nouveau_object_new(nv_object(drm), NVDRM_DEVICE, 0xd1500000, - NV04_DISP_CLASS, NULL, 0, &disp->core); - if (ret) - return ret; - nv04_crtc_create(dev, 0); if (nv_two_heads(dev)) nv04_crtc_create(dev, 1); diff --git a/drivers/gpu/drm/nouveau/dispnv04/disp.h b/drivers/gpu/drm/nouveau/dispnv04/disp.h index 56a28db..4245fc3 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/disp.h +++ b/drivers/gpu/drm/nouveau/dispnv04/disp.h @@ -80,7 +80,6 @@ struct nv04_display { struct nv04_mode_state saved_reg; uint32_t saved_vga_font[4][16384]; uint32_t dac_users[4]; - struct nouveau_object *core; struct nouveau_bo *image[2]; }; |
