summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-08-06 10:21:20 +1000
committerDave Airlie <airlied@redhat.com>2008-08-06 10:21:20 +1000
commit513d4c3ff1937159e0d32047376415df09031ce6 (patch)
tree266fcbf48be4f8685f252ea0f6d0cc7d480c9601 /shared-core
parent4748fbcbd7b0337448ce88c2cdbbc500ff959e42 (diff)
radeon: fix setting new memmap in right place
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/radeon_cp.c2
-rw-r--r--shared-core/radeon_drv.h2
-rw-r--r--shared-core/radeon_state.c1
3 files changed, 3 insertions, 2 deletions
diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index 430f5493..4c03f739 100644
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -2301,7 +2301,7 @@ int radeon_modeset_cp_init(struct drm_device *dev)
dev_priv->ring.tail_mask = (dev_priv->ring.size / sizeof(u32)) - 1;
dev_priv->ring.high_mark = RADEON_RING_HIGH_MARK;
- dev_priv->new_memmap = 1;
+ dev_priv->new_memmap = true;
r300_init_reg_flags(dev);
diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h
index 0363dfd4..94975e4d 100644
--- a/shared-core/radeon_drv.h
+++ b/shared-core/radeon_drv.h
@@ -312,7 +312,7 @@ typedef struct drm_radeon_private {
drm_radeon_ring_buffer_t ring;
- int new_memmap;
+ bool new_memmap;
bool user_mm_enable;
diff --git a/shared-core/radeon_state.c b/shared-core/radeon_state.c
index ca10db4b..e168ea02 100644
--- a/shared-core/radeon_state.c
+++ b/shared-core/radeon_state.c
@@ -3184,6 +3184,7 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
break;
case RADEON_SETPARAM_MM_INIT:
dev_priv->user_mm_enable = true;
+ dev_priv->new_memmap = true;
return radeon_gem_mm_init(dev);
default:
DRM_DEBUG("Invalid parameter %d\n", sp->param);