Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 115693
b: refs/heads/master
c: 962d4fd
h: refs/heads/master
i:
  115691: e57c2cb
v: v3
  • Loading branch information
Keith Packard authored and Dave Airlie committed Oct 17, 2008
1 parent 4cd06a6 commit 1c79efd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0790d5e148c0747499742a3c09ba5f1c07f9ed0d
refs/heads/master: 962d4fd7273e144ae003ddb90138ae4b80567c70
12 changes: 0 additions & 12 deletions trunk/drivers/gpu/drm/i915/i915_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,6 @@ 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 (!dev_priv->mmio_map) {
i915_dma_cleanup(dev);
DRM_ERROR("can not find mmio map!\n");
return -EINVAL;
}

dev_priv->sarea_priv = (drm_i915_sarea_t *)
((u8 *) dev_priv->sarea->handle + init->sarea_priv_offset);

Expand Down Expand Up @@ -194,11 +187,6 @@ static int i915_dma_resume(struct drm_device * dev)
return -EINVAL;
}

if (!dev_priv->mmio_map) {
DRM_ERROR("can not find mmio map!\n");
return -EINVAL;
}

if (dev_priv->ring.map.handle == NULL) {
DRM_ERROR("can not ioremap virtual address for"
" ring buffer\n");
Expand Down

0 comments on commit 1c79efd

Please sign in to comment.