summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@hobbes.virtuousgeek.org>2007-05-22 13:38:58 -0700
committerJesse Barnes <jbarnes@hobbes.virtuousgeek.org>2007-05-22 13:38:58 -0700
commite918d2b7814e2cf5345dba63031c402010b1d3e4 (patch)
treebb21f2202ec96c6a108fc97627672d7501cfc8f6 /linux-core
parenta4929b921e44dcd3cae8e384b9b7eabc51db28ff (diff)
Call preallocated space VRAM instead of PRIV0 to be more consistent with
other drivers.
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/i915_buffer.c5
-rw-r--r--linux-core/i915_drv.c4
-rw-r--r--linux-core/intel_fb.c2
3 files changed, 7 insertions, 4 deletions
diff --git a/linux-core/i915_buffer.c b/linux-core/i915_buffer.c
index 8589f467..6e93ae21 100644
--- a/linux-core/i915_buffer.c
+++ b/linux-core/i915_buffer.c
@@ -86,7 +86,7 @@ int i915_init_mem_type(drm_device_t * dev, uint32_t type,
_DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_NEEDS_IOREMAP;
man->drm_bus_maptype = _DRM_AGP;
break;
- case DRM_BO_MEM_PRIV0:
+ case DRM_BO_MEM_VRAM:
if (!(drm_core_has_AGP(dev) && dev->agp)) {
DRM_ERROR("AGP is not enabled for memory type %u\n",
(unsigned)type);
@@ -99,6 +99,9 @@ int i915_init_mem_type(drm_device_t * dev, uint32_t type,
_DRM_FLAG_MEMTYPE_FIXED | _DRM_FLAG_NEEDS_IOREMAP;
man->drm_bus_maptype = _DRM_AGP;
break;
+ case DRM_BO_MEM_PRIV0: /* for OS preallocated space */
+ DRM_ERROR("PRIV0 not used yet.\n");
+ break;
default:
DRM_ERROR("Unsupported memory type %u\n", (unsigned)type);
return -EINVAL;
diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index ecf42771..4d4029aa 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -53,8 +53,8 @@ static drm_fence_driver_t i915_fence_driver = {
#endif
#ifdef I915_HAVE_BUFFER
-static uint32_t i915_mem_prios[] = {DRM_BO_MEM_PRIV0, DRM_BO_MEM_TT, DRM_BO_MEM_LOCAL};
-static uint32_t i915_busy_prios[] = {DRM_BO_MEM_TT, DRM_BO_MEM_PRIV0, DRM_BO_MEM_LOCAL};
+static uint32_t i915_mem_prios[] = {DRM_BO_MEM_VRAM, DRM_BO_MEM_PRIV0, DRM_BO_MEM_TT, DRM_BO_MEM_LOCAL};
+static uint32_t i915_busy_prios[] = {DRM_BO_MEM_TT, DRM_BO_MEM_PRIV0, DRM_BO_MEM_VRAM, DRM_BO_MEM_LOCAL};
static drm_bo_driver_t i915_bo_driver = {
.mem_type_prio = i915_mem_prios,
diff --git a/linux-core/intel_fb.c b/linux-core/intel_fb.c
index 449ef543..3bfbcda3 100644
--- a/linux-core/intel_fb.c
+++ b/linux-core/intel_fb.c
@@ -473,7 +473,7 @@ int intelfb_probe(struct drm_device *dev, struct drm_crtc *crtc)
drm_bo_type_kernel,
DRM_BO_FLAG_READ |
DRM_BO_FLAG_WRITE |
- DRM_BO_FLAG_MEM_PRIV0 | /* FIXME! */
+ DRM_BO_FLAG_MEM_VRAM | /* FIXME! */
DRM_BO_FLAG_NO_MOVE,
0, 0, 0,
&fbo);