OSDN Git Service
(root)
/
android-x86
/
external-libdrm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ee15459
)
i915: Only look up dev_priv->mmio_map if it's not already set up
author
Kristian Høgsberg
<krh@redhat.com>
Tue, 12 Feb 2008 21:08:18 +0000
(16:08 -0500)
committer
Kristian Høgsberg
<krh@sasori.boston.redhat.com>
Wed, 13 Feb 2008 18:34:02 +0000
(13:34 -0500)
shared-core/i915_dma.c
patch
|
blob
|
history
diff --git
a/shared-core/i915_dma.c
b/shared-core/i915_dma.c
index
0682a33
..
fc00920
100644
(file)
--- a/
shared-core/i915_dma.c
+++ b/
shared-core/i915_dma.c
@@
-117,7
+117,8
@@
static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
return -EINVAL;
}
- dev_priv->mmio_map = drm_core_findmap(dev, init->mmio_offset);
+ if (init->mmio_offset != 0)
+ dev_priv->mmio_map = drm_core_findmap(dev, init->mmio_offset);
if (!dev_priv->mmio_map) {
i915_dma_cleanup(dev);
DRM_ERROR("can not find mmio map!\n");