comment out unworkable code

This commit is contained in:
Dave Airlie 2007-04-11 14:43:02 +10:00
parent 3dd5dc5728
commit add7a928ad

View file

@ -45,7 +45,7 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
return ret; return ret;
} }
#if 0
ret = drm_setup(dev); ret = drm_setup(dev);
if (ret) { if (ret) {
DRM_ERROR("drm_setup failed\n"); DRM_ERROR("drm_setup failed\n");
@ -61,17 +61,17 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
} }
/* FIXME: where does the sarea_priv really go? */ /* FIXME: where does the sarea_priv really go? */
dev_priv->sarea_priv = kmalloc(sizeof(drm_i915_sarea_t), GFP_KERNEL); // dev_priv->sarea_priv = kmalloc(sizeof(drm_i915_sarea_t), GFP_KERNEL);
/* FIXME: need real front buffer offset */ /* FIXME: need real front buffer offset */
dev_priv->sarea_priv->front_handle = dev_priv->baseaddr + 1024*1024; /// dev_priv->sarea_priv->front_handle = dev_priv->baseaddr + 1024*1024;
#endif
drm_bo_driver_init(dev); drm_bo_driver_init(dev);
/* this probably doesn't belong here - TODO */ /* this probably doesn't belong here - TODO */
//drm_framebuffer_set_object(dev, dev_priv->sarea_priv->front_handle); //drm_framebuffer_set_object(dev, dev_priv->sarea_priv->front_handle);
intel_modeset_init(dev); intel_modeset_init(dev);
drm_set_desired_modes(dev); // drm_set_desired_modes(dev);
#if 0
/* FIXME: command ring needs AGP space, do we own it at this point? */ /* FIXME: command ring needs AGP space, do we own it at this point? */
dev_priv->ring.Start = dev_priv->baseaddr; dev_priv->ring.Start = dev_priv->baseaddr;
dev_priv->ring.End = 128*1024; dev_priv->ring.End = 128*1024;
@ -125,6 +125,7 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
I915_WRITE(0x02080, dev_priv->dma_status_page); I915_WRITE(0x02080, dev_priv->dma_status_page);
DRM_DEBUG("Enabled hardware status page\n"); DRM_DEBUG("Enabled hardware status page\n");
#endif
return 0; return 0;
} }