diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-01 09:02:09 -0500 |
|---|---|---|
| committer | Nian Wu <nian@tinderbox.sh.intel.com> | 2007-03-01 09:02:09 -0500 |
| commit | 6c48b8e7ffd0af4d49855d7175e822f4af1f526f (patch) | |
| tree | 4ec7cf10147f3a17e6d4eeec8e48faa90880b8d9 /shared-core/nouveau_state.c | |
| parent | 0bbbb46650667c84a50f1a675a7a910d6ef7df4b (diff) | |
| parent | 72caa48c82e4334d3292185dbadf758d2dd14c16 (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Diffstat (limited to 'shared-core/nouveau_state.c')
| -rw-r--r-- | shared-core/nouveau_state.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c index f1f272e7..e1fc6330 100644 --- a/shared-core/nouveau_state.c +++ b/shared-core/nouveau_state.c @@ -181,8 +181,14 @@ int nouveau_ioctl_getparam(DRM_IOCTL_ARGS) case NOUVEAU_GETPARAM_AGP_PHYSICAL: getparam.value=dev_priv->agp_phys; break; + case NOUVEAU_GETPARAM_FB_SIZE: + getparam.value=dev_priv->fb_available_size; + break; + case NOUVEAU_GETPARAM_AGP_SIZE: + getparam.value=dev_priv->agp_available_size; + break; default: - DRM_ERROR("unknown parameter %d\n", getparam.param); + DRM_ERROR("unknown parameter %lld\n", getparam.param); return DRM_ERR(EINVAL); } @@ -207,7 +213,8 @@ int nouveau_ioctl_setparam(DRM_IOCTL_ARGS) case NOUVEAU_MEM_FB: break; default: - DRM_ERROR("invalid CMDBUF_LOCATION value=%d\n", setparam.value); + DRM_ERROR("invalid CMDBUF_LOCATION value=%lld\n", + setparam.value); return DRM_ERR(EINVAL); } dev_priv->config.cmdbuf.location = setparam.value; @@ -216,7 +223,7 @@ int nouveau_ioctl_setparam(DRM_IOCTL_ARGS) dev_priv->config.cmdbuf.size = setparam.value; break; default: - DRM_ERROR("unknown parameter %d\n", setparam.param); + DRM_ERROR("unknown parameter %lld\n", setparam.param); return DRM_ERR(EINVAL); } |