]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1b263f2)
intel-gtt: consolidate fake_agp driver structs
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Sat, 11 Sep 2010 22:29:26 +0000 (00:29 +0200)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 21 Sep 2010 10:39:19 +0000 (11:39 +0100)
They're now all the same.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/char/agp/intel-gtt.c patch | blob | history

diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index abd422c806c5cfd2018f2d37a7bcf9f31e8fb3fb..57dc50488d18ea952299c89b1735f6b655ac6686 100644 (file)
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -1280,99 +1280,7 @@ static const struct agp_bridge_driver intel_810_driver = {
        .agp_type_to_mask_type  = agp_generic_type_to_mask_type,
 };
 
-static const struct agp_bridge_driver intel_830_driver = {
-       .owner                  = THIS_MODULE,
-       .size_type              = FIXED_APER_SIZE,
-       .aperture_sizes         = intel_fake_agp_sizes,
-       .num_aperture_sizes     = ARRAY_SIZE(intel_fake_agp_sizes),
-       .configure              = intel_fake_agp_configure,
-       .fetch_size             = intel_fake_agp_fetch_size,
-       .cleanup                = intel_gtt_cleanup,
-       .agp_enable             = intel_fake_agp_enable,
-       .cache_flush            = global_cache_flush,
-       .create_gatt_table      = intel_fake_agp_create_gatt_table,
-       .free_gatt_table        = intel_fake_agp_free_gatt_table,
-       .insert_memory          = intel_fake_agp_insert_entries,
-       .remove_memory          = intel_fake_agp_remove_entries,
-       .alloc_by_type          = intel_fake_agp_alloc_by_type,
-       .free_by_type           = intel_i810_free_by_type,
-       .agp_alloc_page         = agp_generic_alloc_page,
-       .agp_alloc_pages        = agp_generic_alloc_pages,
-       .agp_destroy_page       = agp_generic_destroy_page,
-       .agp_destroy_pages      = agp_generic_destroy_pages,
-       .chipset_flush          = intel_fake_agp_chipset_flush,
-};
-
-static const struct agp_bridge_driver intel_915_driver = {
-       .owner                  = THIS_MODULE,
-       .size_type              = FIXED_APER_SIZE,
-       .aperture_sizes         = intel_fake_agp_sizes,
-       .num_aperture_sizes     = ARRAY_SIZE(intel_fake_agp_sizes),
-       .configure              = intel_fake_agp_configure,
-       .fetch_size             = intel_fake_agp_fetch_size,
-       .cleanup                = intel_gtt_cleanup,
-       .agp_enable             = intel_fake_agp_enable,
-       .cache_flush            = global_cache_flush,
-       .create_gatt_table      = intel_fake_agp_create_gatt_table,
-       .free_gatt_table        = intel_fake_agp_free_gatt_table,
-       .insert_memory          = intel_fake_agp_insert_entries,
-       .remove_memory          = intel_fake_agp_remove_entries,
-       .alloc_by_type          = intel_fake_agp_alloc_by_type,
-       .free_by_type           = intel_i810_free_by_type,
-       .agp_alloc_page         = agp_generic_alloc_page,
-       .agp_alloc_pages        = agp_generic_alloc_pages,
-       .agp_destroy_page       = agp_generic_destroy_page,
-       .agp_destroy_pages      = agp_generic_destroy_pages,
-       .chipset_flush          = intel_fake_agp_chipset_flush,
-};
-
-static const struct agp_bridge_driver intel_i965_driver = {
-       .owner                  = THIS_MODULE,
-       .size_type              = FIXED_APER_SIZE,
-       .aperture_sizes         = intel_fake_agp_sizes,
-       .num_aperture_sizes     = ARRAY_SIZE(intel_fake_agp_sizes),
-       .configure              = intel_fake_agp_configure,
-       .fetch_size             = intel_fake_agp_fetch_size,
-       .cleanup                = intel_gtt_cleanup,
-       .agp_enable             = intel_fake_agp_enable,
-       .cache_flush            = global_cache_flush,
-       .create_gatt_table      = intel_fake_agp_create_gatt_table,
-       .free_gatt_table        = intel_fake_agp_free_gatt_table,
-       .insert_memory          = intel_fake_agp_insert_entries,
-       .remove_memory          = intel_fake_agp_remove_entries,
-       .alloc_by_type          = intel_fake_agp_alloc_by_type,
-       .free_by_type           = intel_i810_free_by_type,
-       .agp_alloc_page         = agp_generic_alloc_page,
-       .agp_alloc_pages        = agp_generic_alloc_pages,
-       .agp_destroy_page       = agp_generic_destroy_page,
-       .agp_destroy_pages      = agp_generic_destroy_pages,
-       .chipset_flush          = intel_fake_agp_chipset_flush,
-};
-
-static const struct agp_bridge_driver intel_gen6_driver = {
-       .owner                  = THIS_MODULE,
-       .size_type              = FIXED_APER_SIZE,
-       .aperture_sizes         = intel_fake_agp_sizes,
-       .num_aperture_sizes     = ARRAY_SIZE(intel_fake_agp_sizes),
-       .configure              = intel_fake_agp_configure,
-       .fetch_size             = intel_fake_agp_fetch_size,
-       .cleanup                = intel_gtt_cleanup,
-       .agp_enable             = intel_fake_agp_enable,
-       .cache_flush            = global_cache_flush,
-       .create_gatt_table      = intel_fake_agp_create_gatt_table,
-       .free_gatt_table        = intel_fake_agp_free_gatt_table,
-       .insert_memory          = intel_fake_agp_insert_entries,
-       .remove_memory          = intel_fake_agp_remove_entries,
-       .alloc_by_type          = intel_fake_agp_alloc_by_type,
-       .free_by_type           = intel_i810_free_by_type,
-       .agp_alloc_page         = agp_generic_alloc_page,
-       .agp_alloc_pages        = agp_generic_alloc_pages,
-       .agp_destroy_page       = agp_generic_destroy_page,
-       .agp_destroy_pages      = agp_generic_destroy_pages,
-       .chipset_flush          = intel_fake_agp_chipset_flush,
-};
-
-static const struct agp_bridge_driver intel_g33_driver = {
+static const struct agp_bridge_driver intel_fake_agp_driver = {
        .owner                  = THIS_MODULE,
        .size_type              = FIXED_APER_SIZE,
        .aperture_sizes         = intel_fake_agp_sizes,
@@ -1478,81 +1386,81 @@ static const struct intel_gtt_driver_description {
        { PCI_DEVICE_ID_INTEL_82815_CGC, "i815", &intel_810_driver,
                &i81x_gtt_driver},
        { PCI_DEVICE_ID_INTEL_82830_CGC, "830M",
-               &intel_830_driver , &i8xx_gtt_driver},
+               &intel_fake_agp_driver, &i8xx_gtt_driver},
        { PCI_DEVICE_ID_INTEL_82845G_IG, "830M",
-               &intel_830_driver , &i8xx_gtt_driver},
+               &intel_fake_agp_driver, &i8xx_gtt_driver},
        { PCI_DEVICE_ID_INTEL_82854_IG, "854",
-               &intel_830_driver , &i8xx_gtt_driver},
+               &intel_fake_agp_driver, &i8xx_gtt_driver},
        { PCI_DEVICE_ID_INTEL_82855GM_IG, "855GM",
-               &intel_830_driver , &i8xx_gtt_driver},
+               &intel_fake_agp_driver, &i8xx_gtt_driver},
        { PCI_DEVICE_ID_INTEL_82865_IG, "865",
-               &intel_830_driver , &i8xx_gtt_driver},
+               &intel_fake_agp_driver, &i8xx_gtt_driver},
        { PCI_DEVICE_ID_INTEL_E7221_IG, "E7221 (i915)",
-               &intel_915_driver , &i915_gtt_driver },
+               &intel_fake_agp_driver, &i915_gtt_driver },
        { PCI_DEVICE_ID_INTEL_82915G_IG, "915G",
-               &intel_915_driver , &i915_gtt_driver },
+               &intel_fake_agp_driver, &i915_gtt_driver },
        { PCI_DEVICE_ID_INTEL_82915GM_IG, "915GM",
-               &intel_915_driver , &i915_gtt_driver },
+               &intel_fake_agp_driver, &i915_gtt_driver },
        { PCI_DEVICE_ID_INTEL_82945G_IG, "945G",
-               &intel_915_driver , &i915_gtt_driver },
+               &intel_fake_agp_driver, &i915_gtt_driver },
        { PCI_DEVICE_ID_INTEL_82945GM_IG, "945GM",
-               &intel_915_driver , &i915_gtt_driver },
+               &intel_fake_agp_driver, &i915_gtt_driver },
        { PCI_DEVICE_ID_INTEL_82945GME_IG, "945GME",
-               &intel_915_driver , &i915_gtt_driver },
+               &intel_fake_agp_driver, &i915_gtt_driver },
        { PCI_DEVICE_ID_INTEL_82946GZ_IG, "946GZ",
-               &intel_i965_driver , &i965_gtt_driver },
+               &intel_fake_agp_driver, &i965_gtt_driver },
        { PCI_DEVICE_ID_INTEL_82G35_IG, "G35",
-               &intel_i965_driver , &i965_gtt_driver },
+               &intel_fake_agp_driver, &i965_gtt_driver },
        { PCI_DEVICE_ID_INTEL_82965Q_IG, "965Q",
-               &intel_i965_driver , &i965_gtt_driver },
+               &intel_fake_agp_driver, &i965_gtt_driver },
        { PCI_DEVICE_ID_INTEL_82965G_IG, "965G",
-               &intel_i965_driver , &i965_gtt_driver },
+               &intel_fake_agp_driver, &i965_gtt_driver },
        { PCI_DEVICE_ID_INTEL_82965GM_IG, "965GM",
-               &intel_i965_driver , &i965_gtt_driver },
+               &intel_fake_agp_driver, &i965_gtt_driver },
        { PCI_DEVICE_ID_INTEL_82965GME_IG, "965GME/GLE",
-               &intel_i965_driver , &i965_gtt_driver },
+               &intel_fake_agp_driver, &i965_gtt_driver },
        { PCI_DEVICE_ID_INTEL_G33_IG, "G33",
-               &intel_g33_driver , &g33_gtt_driver },
+               &intel_fake_agp_driver, &g33_gtt_driver },
        { PCI_DEVICE_ID_INTEL_Q35_IG, "Q35",
-               &intel_g33_driver , &g33_gtt_driver },
+               &intel_fake_agp_driver, &g33_gtt_driver },
        { PCI_DEVICE_ID_INTEL_Q33_IG, "Q33",
-               &intel_g33_driver , &g33_gtt_driver },
+               &intel_fake_agp_driver, &g33_gtt_driver },
        { PCI_DEVICE_ID_INTEL_PINEVIEW_M_IG, "GMA3150",
-               &intel_g33_driver , &pineview_gtt_driver },
+               &intel_fake_agp_driver, &pineview_gtt_driver },
        { PCI_DEVICE_ID_INTEL_PINEVIEW_IG, "GMA3150",
-               &intel_g33_driver , &pineview_gtt_driver },
+               &intel_fake_agp_driver, &pineview_gtt_driver },
        { PCI_DEVICE_ID_INTEL_GM45_IG, "GM45",
-               &intel_i965_driver , &g4x_gtt_driver },
+               &intel_fake_agp_driver, &g4x_gtt_driver },
        { PCI_DEVICE_ID_INTEL_EAGLELAKE_IG, "Eaglelake",
-               &intel_i965_driver , &g4x_gtt_driver },
+               &intel_fake_agp_driver, &g4x_gtt_driver },
        { PCI_DEVICE_ID_INTEL_Q45_IG, "Q45/Q43",
-               &intel_i965_driver , &g4x_gtt_driver },
+               &intel_fake_agp_driver, &g4x_gtt_driver },
        { PCI_DEVICE_ID_INTEL_G45_IG, "G45/G43",
-               &intel_i965_driver , &g4x_gtt_driver },
+               &intel_fake_agp_driver, &g4x_gtt_driver },
        { PCI_DEVICE_ID_INTEL_B43_IG, "B43",
-               &intel_i965_driver , &g4x_gtt_driver },
+               &intel_fake_agp_driver, &g4x_gtt_driver },
        { PCI_DEVICE_ID_INTEL_B43_1_IG, "B43",
-               &intel_i965_driver , &g4x_gtt_driver },
+               &intel_fake_agp_driver, &g4x_gtt_driver },
        { PCI_DEVICE_ID_INTEL_G41_IG, "G41",
-               &intel_i965_driver , &g4x_gtt_driver },
+               &intel_fake_agp_driver, &g4x_gtt_driver },
        { PCI_DEVICE_ID_INTEL_IRONLAKE_D_IG,
-           "HD Graphics", &intel_i965_driver , &ironlake_gtt_driver },
+           "HD Graphics", &intel_fake_agp_driver, &ironlake_gtt_driver },
        { PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG,
-           "HD Graphics", &intel_i965_driver , &ironlake_gtt_driver },
+           "HD Graphics", &intel_fake_agp_driver, &ironlake_gtt_driver },
        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_GT1_IG,
-           "Sandybridge", &intel_gen6_driver , &sandybridge_gtt_driver },
+           "Sandybridge", &intel_fake_agp_driver, &sandybridge_gtt_driver },
        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_GT2_IG,
-           "Sandybridge", &intel_gen6_driver , &sandybridge_gtt_driver },
+           "Sandybridge", &intel_fake_agp_driver, &sandybridge_gtt_driver },
        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_GT2_PLUS_IG,
-           "Sandybridge", &intel_gen6_driver , &sandybridge_gtt_driver },
+           "Sandybridge", &intel_fake_agp_driver, &sandybridge_gtt_driver },
        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_GT1_IG,
-           "Sandybridge", &intel_gen6_driver , &sandybridge_gtt_driver },
+           "Sandybridge", &intel_fake_agp_driver, &sandybridge_gtt_driver },
        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_GT2_IG,
-           "Sandybridge", &intel_gen6_driver , &sandybridge_gtt_driver },
+           "Sandybridge", &intel_fake_agp_driver, &sandybridge_gtt_driver },
        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_GT2_PLUS_IG,
-           "Sandybridge", &intel_gen6_driver , &sandybridge_gtt_driver },
+           "Sandybridge", &intel_fake_agp_driver, &sandybridge_gtt_driver },
        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_IG,
-           "Sandybridge", &intel_gen6_driver , &sandybridge_gtt_driver },
+           "Sandybridge", &intel_fake_agp_driver, &sandybridge_gtt_driver },
        { 0, NULL, NULL }
 };
 
Linux kernel for KaRo TX COM modules