radeon: fix setting new memmap in right place

diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index 430f549..4c03f73 100644 (file)
--- 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 0363dfd..94975e4 100644 (file)
--- 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 ca10db4..e168ea0 100644 (file)
--- 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);