From 634d65af3a407a70c08ad407ac6aa3f56f473a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Mon, 7 Aug 2006 20:33:57 +1000 Subject: [PATCH] --- yaml --- r: 37494 b: refs/heads/master c: 8624ecbf68e90e5a8124514a0b7f92767fb80a62 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/radeon_state.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e0e7c57ffb99..59e97dcc4394 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ca941615ee6418cd38c13602960f29c7ac7d973 +refs/heads/master: 8624ecbf68e90e5a8124514a0b7f92767fb80a62 diff --git a/trunk/drivers/char/drm/radeon_state.c b/trunk/drivers/char/drm/radeon_state.c index 99589fe0032f..0433ff80cb70 100644 --- a/trunk/drivers/char/drm/radeon_state.c +++ b/trunk/drivers/char/drm/radeon_state.c @@ -2987,7 +2987,11 @@ static int radeon_cp_getparam(DRM_IOCTL_ARGS) case RADEON_PARAM_GART_TEX_HANDLE: value = dev_priv->gart_textures_offset; break; - + case RADEON_PARAM_SCRATCH_OFFSET: + if (!dev_priv->writeback_works) + return DRM_ERR(EINVAL); + value = RADEON_SCRATCH_REG_OFFSET; + break; case RADEON_PARAM_CARD_TYPE: if (dev_priv->flags & CHIP_IS_PCIE) value = RADEON_CARD_PCIE;