summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@hobbes.virtuousgeek.org>2007-04-17 18:20:05 -0700
committerJesse Barnes <jbarnes@hobbes.virtuousgeek.org>2007-04-17 18:20:05 -0700
commitc71c44bb9288e0bf1b319ec19a2e25f4467d9583 (patch)
treecdb4fc7d4a107082cd6d039706991c4118af840d
parent4f0841a31cbed315a3e891557eadc55cab0dfd23 (diff)
parentd20aaf485893ed11dd0d68daf63ccadd77b02213 (diff)
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
-rw-r--r--linux-core/drm_crtc.c6
-rw-r--r--linux-core/drm_drv.c15
-rw-r--r--linux-core/intel_sdvo.c5
-rw-r--r--shared-core/i915_init.c1
4 files changed, 16 insertions, 11 deletions
diff --git a/linux-core/drm_crtc.c b/linux-core/drm_crtc.c
index 0fb5b9ae..437259d5 100644
--- a/linux-core/drm_crtc.c
+++ b/linux-core/drm_crtc.c
@@ -572,7 +572,7 @@ bool drm_initial_config(drm_device_t *dev, bool can_grow)
/* bind analog output to one crtc */
list_for_each_entry(output, &dev->mode_config.output_list, head) {
- struct drm_display_mode *des_mode;
+ struct drm_display_mode *des_mode = NULL;
if (list_empty(&output->modes))
continue;
@@ -582,6 +582,10 @@ bool drm_initial_config(drm_device_t *dev, bool can_grow)
if (des_mode->flags & DRM_MODE_TYPE_PREFERRED)
break;
}
+
+ if (!des_mode)
+ continue;
+
if (!strncmp(output->name, "VGA", 3)) {
DRM_DEBUG("VGA preferred mode: %s\n", des_mode->name);
drm_setup_output(output, vga_crtc, des_mode);
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index 7bb8c659..5aa7137b 100644
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -375,9 +375,6 @@ static void drm_cleanup(drm_device_t * dev)
drm_lastclose(dev);
drm_fence_manager_takedown(dev);
- if (!drm_fb_loaded)
- pci_disable_device(dev->pdev);
-
drm_ctxbitmap_cleanup(dev);
if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) && dev->agp
@@ -389,15 +386,16 @@ static void drm_cleanup(drm_device_t * dev)
DRM_DEBUG("mtrr_del=%d\n", retval);
}
- // drm_bo_driver_finish(dev);
-
+ if (dev->driver->unload)
+ dev->driver->unload(dev);
+
if (drm_core_has_AGP(dev) && dev->agp) {
drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
dev->agp = NULL;
}
- if (dev->driver->unload)
- dev->driver->unload(dev);
+
+ // drm_bo_driver_finish(dev);
if (dev->maplist) {
drm_free(dev->maplist, sizeof(*dev->maplist), DRM_MEM_MAPS);
dev->maplist = NULL;
@@ -406,6 +404,9 @@ static void drm_cleanup(drm_device_t * dev)
drm_ht_remove(&dev->object_hash);
}
+ if (!drm_fb_loaded)
+ pci_disable_device(dev->pdev);
+
drm_put_head(&dev->primary);
if (drm_put_dev(dev))
DRM_ERROR("Cannot unload module\n");
diff --git a/linux-core/intel_sdvo.c b/linux-core/intel_sdvo.c
index 6f592f8a..5dbfb8eb 100644
--- a/linux-core/intel_sdvo.c
+++ b/linux-core/intel_sdvo.c
@@ -70,10 +70,9 @@ static void intel_sdvo_write_sdvox(struct drm_output *output, u32 val)
int i;
if (sdvo_priv->output_device == SDVOB)
- bval = I915_READ(SDVOB);
- else
cval = I915_READ(SDVOC);
-
+ else
+ bval = I915_READ(SDVOB);
/*
* Write the registers twice for luck. Sometimes,
* writing them only once doesn't appear to 'stick'.
diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 3e44dd54..0c9ef4d4 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -265,6 +265,7 @@ int i915_driver_unload(drm_device_t *dev)
drm_mem_reg_iounmap(dev, &dev_priv->ring_buffer->mem,
dev_priv->ring.virtual_start);
+ DRM_DEBUG("usage is %d\n", dev_priv->ring_buffer->usage);
mutex_lock(&dev->struct_mutex);
drm_bo_usage_deref_locked(dev_priv->ring_buffer);
mutex_unlock(&dev->struct_mutex);