From: <ai...@ke...> - 2008-05-22 23:40:46
|
shared-core/nouveau_state.c | 2 +- shared-core/r300_cmdbuf.c | 2 ++ shared-core/r300_reg.h | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) New commits: commit 49075b678fad6c3a5cadd1af67a37332b9255ace Author: Dave Airlie <ai...@re...> Date: Fri May 23 09:39:54 2008 +1000 r500: add two more register ranges for mesa driver to setup diff --git a/shared-core/r300_cmdbuf.c b/shared-core/r300_cmdbuf.c index 1da5101..bff6378 100644 --- a/shared-core/r300_cmdbuf.c +++ b/shared-core/r300_cmdbuf.c @@ -241,6 +241,8 @@ void r300_init_reg_flags(struct drm_device *dev) ADD_RANGE(R500_US_FC_CTRL, 1); ADD_RANGE(R500_RS_IP_0, 16); ADD_RANGE(R500_RS_INST_0, 16); + ADD_RANGE(R500_RB3D_COLOR_CLEAR_VALUE_AR, 2); + ADD_RANGE(R500_RB3D_CONSTANT_COLOR_AR, 2); } else { ADD_RANGE(R300_PFS_CNTL_0, 3); ADD_RANGE(R300_PFS_NODE_0, 4); diff --git a/shared-core/r300_reg.h b/shared-core/r300_reg.h index 1928038..0be01fc 100644 --- a/shared-core/r300_reg.h +++ b/shared-core/r300_reg.h @@ -1639,6 +1639,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #define R500_US_FC_CTRL 0x4624 #define R500_US_CODE_ADDR 0x4630 +#define R500_RB3D_COLOR_CLEAR_VALUE_AR 0x46c0 +#define R500_RB3D_CONSTANT_COLOR_AR 0x4ef8 + #endif /* _R300_REG_H */ /* *INDENT-ON* */ commit 74a9ea896e4c3f4bb3c7195872755ad40da30828 Author: Dave Airlie <ai...@re...> Date: Thu May 15 11:13:03 2008 +1000 drm: fix nouveau warning diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c index 0183b0b..d9c6efe 100644 --- a/shared-core/nouveau_state.c +++ b/shared-core/nouveau_state.c @@ -615,7 +615,7 @@ int nouveau_ioctl_getparam(struct drm_device *dev, void *data, struct drm_file * break; case NOUVEAU_GETPARAM_PCI_PHYSICAL: if ( dev -> sg ) - getparam->value=(uint64_t) dev->sg->virtual; + getparam->value=(unsigned long)dev->sg->virtual; else { DRM_ERROR("Requested PCIGART address, while no PCIGART was created\n"); |