aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv04_display.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-07-03 20:47:19 -0400
committerBen Skeggs <bskeggs@redhat.com>2011-09-20 02:05:04 -0400
commit048a88595a66526f68636b51b1cdb5842bc0f28c (patch)
treeb1d1378c1d6b87c9ab5687f355630697a2a3874a /drivers/gpu/drm/nouveau/nv04_display.c
parent2e9733ff7d4f1c7185bea16041f532d6142ca40a (diff)
drm/nouveau: make general drm modesetting init common
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv04_display.c')
-rw-r--r--drivers/gpu/drm/nouveau/nv04_display.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_display.c b/drivers/gpu/drm/nouveau/nv04_display.c
index 1715e1464b7d..6bd8518d7b2e 100644
--- a/drivers/gpu/drm/nouveau/nv04_display.c
+++ b/drivers/gpu/drm/nouveau/nv04_display.c
@@ -126,27 +126,6 @@ nv04_display_create(struct drm_device *dev)
126 126
127 nouveau_hw_save_vga_fonts(dev, 1); 127 nouveau_hw_save_vga_fonts(dev, 1);
128 128
129 drm_mode_config_init(dev);
130 drm_mode_create_scaling_mode_property(dev);
131 drm_mode_create_dithering_property(dev);
132
133 dev->mode_config.funcs = (void *)&nouveau_mode_config_funcs;
134
135 dev->mode_config.min_width = 0;
136 dev->mode_config.min_height = 0;
137 switch (dev_priv->card_type) {
138 case NV_04:
139 dev->mode_config.max_width = 2048;
140 dev->mode_config.max_height = 2048;
141 break;
142 default:
143 dev->mode_config.max_width = 4096;
144 dev->mode_config.max_height = 4096;
145 break;
146 }
147
148 dev->mode_config.fb_base = dev_priv->fb_phys;
149
150 nv04_crtc_create(dev, 0); 129 nv04_crtc_create(dev, 0);
151 if (nv_two_heads(dev)) 130 if (nv_two_heads(dev))
152 nv04_crtc_create(dev, 1); 131 nv04_crtc_create(dev, 1);
@@ -235,8 +214,6 @@ nv04_display_destroy(struct drm_device *dev)
235 list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) 214 list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
236 crtc->funcs->restore(crtc); 215 crtc->funcs->restore(crtc);
237 216
238 drm_mode_config_cleanup(dev);
239
240 nouveau_hw_save_vga_fonts(dev, 0); 217 nouveau_hw_save_vga_fonts(dev, 0);
241} 218}
242 219