diff options
| author | Jerome Glisse <glisse@freedesktop.org> | 2008-03-20 17:44:32 +0100 |
|---|---|---|
| committer | John Doe <glisse@freedesktop.org> | 2008-03-20 17:44:32 +0100 |
| commit | 71b66b00435a10e762a4bb7abedb263196942da4 (patch) | |
| tree | 99bbf149f64f14fdc2cd389ec53188c7ce4e040f /shared-core/radeon_state.c | |
| parent | 6ef119abf5d19c85fe039fd19d12e9bd64fd44df (diff) | |
| parent | 607964ed9e5f6d86a0960bef2341e7f5de9c71da (diff) | |
Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Diffstat (limited to 'shared-core/radeon_state.c')
| -rw-r--r-- | shared-core/radeon_state.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/shared-core/radeon_state.c b/shared-core/radeon_state.c index 6ff952e1..7bcf210a 100644 --- a/shared-core/radeon_state.c +++ b/shared-core/radeon_state.c @@ -3126,12 +3126,14 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil DRM_DEBUG("color tiling disabled\n"); dev_priv->front_pitch_offset &= ~RADEON_DST_TILE_MACRO; dev_priv->back_pitch_offset &= ~RADEON_DST_TILE_MACRO; - dev_priv->sarea_priv->tiling_enabled = 0; + if (dev_priv->sarea_priv) + dev_priv->sarea_priv->tiling_enabled = 0; } else if (sp->value == 1) { DRM_DEBUG("color tiling enabled\n"); dev_priv->front_pitch_offset |= RADEON_DST_TILE_MACRO; dev_priv->back_pitch_offset |= RADEON_DST_TILE_MACRO; - dev_priv->sarea_priv->tiling_enabled = 1; + if (dev_priv->sarea_priv) + dev_priv->sarea_priv->tiling_enabled = 1; } break; case RADEON_SETPARAM_PCIGART_LOCATION: |