i915g: Move pci id to winsys struct

src/gallium/drivers/i915/i915_screen.c

@@ -55,7 +55,7 @@ i915_get_name(struct pipe_screen *screen)
    static char buffer[128];
    const char *chipset;
 
-   switch (i915_screen(screen)->pci_id) {
+   switch (i915_screen(screen)->iws->pci_id) {
    case PCI_CHIP_I915_G:
       chipset = "915G";
       break;
@@ -271,14 +271,14 @@ i915_destroy_screen(struct pipe_screen *screen)
  * Create a new i915_screen object
  */
 struct pipe_screen *
-i915_create_screen(struct i915_winsys *iws, uint pci_id)
+i915_screen_create(struct i915_winsys *iws)
 {
    struct i915_screen *is = CALLOC_STRUCT(i915_screen);
 
    if (!is)
       return NULL;
 
-   switch (pci_id) {
+   switch (iws->pci_id) {
    case PCI_CHIP_I915_G:
    case PCI_CHIP_I915_GM:
       is->is_i945 = FALSE;
@@ -295,12 +295,11 @@ i915_create_screen(struct i915_winsys *iws, uint pci_id)
 
    default:
       debug_printf("%s: unknown pci id 0x%x, cannot create screen\n", 
-                   __FUNCTION__, pci_id);
+                   __FUNCTION__, iws->pci_id);
       FREE(is);
       return NULL;
    }
 
-   is->pci_id = pci_id;
    is->iws = iws;
 
    is->base.winsys = NULL;

src/gallium/drivers/i915/i915_screen.h

@@ -45,7 +45,6 @@ struct i915_screen
    struct i915_winsys *iws;
 
    boolean is_i945;
-   uint pci_id;
 };
 
 /**

src/gallium/drivers/i915/i915_winsys.h

@@ -81,6 +81,8 @@ struct i915_winsys_batchbuffer {
 
 struct i915_winsys {
 
+   unsigned pci_id; /**< PCI ID for the device */
+
    /**
     * Batchbuffer functions.
     */
@@ -224,7 +226,7 @@ struct i915_winsys {
 /**
  * Create i915 pipe_screen.
  */
-struct pipe_screen *i915_create_screen(struct i915_winsys *iws, unsigned pci_id);
+struct pipe_screen *i915_screen_create(struct i915_winsys *iws);
 
 
 #endif

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 =

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 {

src/gallium/winsys/i915/sw/i915_sw_winsys.c

@@ -46,11 +46,11 @@ i915_sw_create_screen()
 
    isws->base.destroy = i915_sw_destroy;
 
-   isws->id = deviceID;
+   isws->base.pci_id = deviceID;
    isws->max_batch_size = 16 * 4096;
 
    isws->dump_cmd = debug_get_bool_option("INTEL_DUMP_CMD", FALSE);
 
    /* XXX so this will leak winsys:es */
-   return i915_create_screen(&isws->base, deviceID);
+   return i915_screen_create(&isws->base);
 }

src/gallium/winsys/i915/sw/i915_sw_winsys.h

@@ -16,8 +16,6 @@ struct i915_sw_winsys
 
    boolean dump_cmd;
 
-   unsigned id;
-
    size_t max_batch_size;
 };