summaryrefslogtreecommitdiff
path: root/src/gallium/winsys/i915/drm
diff options
context:
space:
mode:
authorJakob Bornecrantz <wallbraker@gmail.com>2010-05-29 13:29:44 +0200
committerJakob Bornecrantz <wallbraker@gmail.com>2010-05-29 13:30:25 +0200
commit835f5a65a11ae9ca9f4b36ceb6656c77041ec901 (patch)
tree4b81ca16c858b9e61a70f9a05e2b067ce3d72f60 /src/gallium/winsys/i915/drm
parentbbaaf823fa98c5c978aa10d61000485c10275f5a (diff)
i915g: Move pci id to winsys struct
Diffstat (limited to 'src/gallium/winsys/i915/drm')
-rw-r--r--src/gallium/winsys/i915/drm/i915_drm_api.c4
-rw-r--r--src/gallium/winsys/i915/drm/i915_drm_winsys.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/winsys/i915/drm/i915_drm_api.c b/src/gallium/winsys/i915/drm/i915_drm_api.c
index b95df40e86c..5a6b45e6c9f 100644
--- a/src/gallium/winsys/i915/drm/i915_drm_api.c
+++ b/src/gallium/winsys/i915/drm/i915_drm_api.c
@@ -65,7 +65,7 @@ i915_drm_create_screen(struct drm_api *api, int drmFD)
i915_drm_winsys_init_fence_functions(idws);
idws->fd = drmFD;
- idws->id = deviceID;
+ idws->base.pci_id = deviceID;
idws->max_batch_size = 16 * 4096;
idws->base.destroy = i915_drm_winsys_destroy;
@@ -75,7 +75,7 @@ i915_drm_create_screen(struct drm_api *api, int drmFD)
idws->dump_cmd = debug_get_bool_option("INTEL_DUMP_CMD", FALSE);
- return i915_create_screen(&idws->base, deviceID);
+ return i915_screen_create(&idws->base);
}
static struct drm_api i915_drm_api =
diff --git a/src/gallium/winsys/i915/drm/i915_drm_winsys.h b/src/gallium/winsys/i915/drm/i915_drm_winsys.h
index 217c4a7eafb..99667bde4ef 100644
--- a/src/gallium/winsys/i915/drm/i915_drm_winsys.h
+++ b/src/gallium/winsys/i915/drm/i915_drm_winsys.h
@@ -21,8 +21,6 @@ struct i915_drm_winsys
int fd; /**< Drm file discriptor */
- unsigned id;
-
size_t max_batch_size;
struct {