Mesa (master): i915g: Fix build.
Vinson Lee
vlee at kemper.freedesktop.org
Tue Mar 29 00:39:03 UTC 2011
Module: Mesa
Branch: master
Commit: 2737350157cf048b436d7b64d420881ff6df9223
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2737350157cf048b436d7b64d420881ff6df9223
Author: Vinson Lee <vlee at vmware.com>
Date: Mon Mar 28 17:37:33 2011 -0700
i915g: Fix build.
Fix build failures introduced with commit 0fbb64a52931ba5871aa2c5eb01b81d391f678d1.
Reviewed-by: Jakob Bornecrantz <wallbraker at gmail.com>
---
src/gallium/winsys/i915/drm/i915_drm_winsys.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/gallium/winsys/i915/drm/i915_drm_winsys.c b/src/gallium/winsys/i915/drm/i915_drm_winsys.c
index a2b61cd..6c8a10d 100644
--- a/src/gallium/winsys/i915/drm/i915_drm_winsys.c
+++ b/src/gallium/winsys/i915/drm/i915_drm_winsys.c
@@ -1,4 +1,7 @@
#include <stdio.h>
+#include <sys/ioctl.h>
+
+#include "i915_drm.h"
#include "state_tracker/drm_driver.h"
@@ -13,13 +16,13 @@
static void
-i915_drm_get_device_id(unsigned int *device_id)
+i915_drm_get_device_id(int fd, unsigned int *device_id)
{
int ret;
struct drm_i915_getparam gp;
gp.param = I915_PARAM_CHIPSET_ID;
- gp.value = (int *)devid;
+ gp.value = (int *)device_id;
ret = ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp, sizeof(gp));
assert(ret == 0);
@@ -45,7 +48,7 @@ i915_drm_winsys_create(int drmFD)
if (!idws)
return NULL;
- i915_drm_get_device_id(&deviceID);
+ i915_drm_get_device_id(drmFD, &deviceID);
i915_drm_winsys_init_batchbuffer_functions(idws);
i915_drm_winsys_init_buffer_functions(idws);
More information about the mesa-commit
mailing list