summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorbin Simpson <MostAwesomeDude@gmail.com>2009-04-04 00:33:23 -0700
committerCorbin Simpson <MostAwesomeDude@gmail.com>2009-04-04 00:36:05 -0700
commitd6fd672bf9a9b7b24147341338055da3b9f81f89 (patch)
tree4f98a4f65eece506cd0783517da46995a6624848
parentbe1dbba0a4d0d75468461aff8c281a512a537ecc (diff)
radeon: Fix compile warnings, compile errors.
-rw-r--r--src/gallium/winsys/drm/radeon/core/radeon_r300.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gallium/winsys/drm/radeon/core/radeon_r300.c b/src/gallium/winsys/drm/radeon/core/radeon_r300.c
index c7b6813014..ce03bf2260 100644
--- a/src/gallium/winsys/drm/radeon/core/radeon_r300.c
+++ b/src/gallium/winsys/drm/radeon/core/radeon_r300.c
@@ -79,10 +79,15 @@ struct r300_winsys*
radeon_create_r300_winsys(int fd, struct radeon_winsys* old_winsys)
{
struct r300_winsys* winsys = CALLOC_STRUCT(r300_winsys);
+ struct radeon_cs_manager* csm;
+
+ if (winsys == NULL) {
+ return NULL;
+ }
do_ioctls(winsys, fd);
- struct radeon_cs_manager* csm = radeon_cs_manager_gem_ctor(fd);
+ csm = radeon_cs_manager_gem_ctor(fd);
winsys->cs = radeon_cs_create(csm, 1024 * 64 / 4);