diff options
author | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-04-10 10:45:55 -0700 |
---|---|---|
committer | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-04-10 10:45:55 -0700 |
commit | 44a8761302888080f1cb6596d4573d88c1746da4 (patch) | |
tree | 851220ca0bdcd7677eda5ea796a4eb5a670bf406 /shared-core/i915_dma.c | |
parent | e114b981bc291049fa6996d487334a408acc1ce2 (diff) | |
parent | 50672adb3142abca743535a8e60c360ef47b2a08 (diff) |
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Conflicts:
linux-core/drm_crtc.c - trivial merge
linux-core/drm_crtc.h - trivial merge
linux-core/intel_display.c - crtc_config -> mode_config
shared-core/i915_dma.c - accommodate new init code in i915_init.c
Diffstat (limited to 'shared-core/i915_dma.c')
-rw-r--r-- | shared-core/i915_dma.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index 0ba3048a..1c8a0d45 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -171,9 +171,7 @@ static int i915_initialize(drm_device_t * dev, I915_WRITE(0x02080, dev_priv->dma_status_page); DRM_DEBUG("Enabled hardware status page\n"); - /* this probably doesn't belong here - TODO */ - drm_framebuffer_set_object(dev, dev_priv->sarea_priv->front_handle); - drm_set_desired_modes(dev); +//drm_set_desired_modes(dev); return 0; } |