[Openchrome-devel] drm-openchrome: drivers/gpu/drm
James Simmons
jsimmons at kemper.freedesktop.org
Mon Jan 21 14:20:46 PST 2013
drivers/gpu/drm/via/via_crtc.c | 2 -
drivers/gpu/drm/via/via_disp_reg.h | 72 ++++++++++++++++++-------------------
drivers/gpu/drm/via/via_display.c | 2 -
drivers/gpu/drm/via/via_drv.c | 16 ++++----
4 files changed, 46 insertions(+), 46 deletions(-)
New commits:
commit 74fbb65b73d9c7d6182459d167a1f0a58fa454e4
Author: James Simmons <jsimmons at infradead.org>
Date: Mon Jan 21 17:20:16 2013 -0500
CONFIG_HOTPLUG is going away so this removes all the __dev* attributes
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index 864a69d..df15b9e 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -1234,7 +1234,7 @@ static const struct drm_crtc_helper_funcs via_iga2_helper_funcs = {
.load_lut = drm_mode_crtc_load_lut,
};
-void __devinit
+void
via_crtc_init(struct drm_device *dev, int index)
{
struct drm_via_private *dev_priv = dev->dev_private;
diff --git a/drivers/gpu/drm/via/via_disp_reg.h b/drivers/gpu/drm/via/via_disp_reg.h
index ebe65fe..7fa8e1a 100644
--- a/drivers/gpu/drm/via/via_disp_reg.h
+++ b/drivers/gpu/drm/via/via_disp_reg.h
@@ -135,49 +135,49 @@
#endif
/* IGA1 FIFO Depth_Select */
-static struct vga_regset iga1_fifo_depth_select[] __devinitdata = {
+static struct vga_regset iga1_fifo_depth_select[] = {
{ VGA_SEQ_I, 0x17, 0, 7 }
};
/* IGA2 FIFO Depth_Select */
-static struct vga_regset iga2_fifo_depth_select[] __devinitdata = {
+static struct vga_regset iga2_fifo_depth_select[] = {
{ VGA_CRT_IC, 0x68, 4, 7 },
{ VGA_CRT_IC, 0x94, 7, 7 },
{ VGA_CRT_IC, 0x95, 7, 7 }
};
/* IGA1 FIFO Threshold Select */
-static struct vga_regset iga1_fifo_threshold_select[] __devinitdata = {
+static struct vga_regset iga1_fifo_threshold_select[] = {
{ VGA_SEQ_I, 0x16, 0, 5 },
{ VGA_SEQ_I, 0x16, 7, 7 }
};
/* IGA2 FIFO Threshold Select */
-static struct vga_regset iga2_fifo_threshold_select[] __devinitdata = {
+static struct vga_regset iga2_fifo_threshold_select[] = {
{ VGA_CRT_IC, 0x68, 0, 3 },
{ VGA_CRT_IC, 0x95, 4, 6 }
};
/* IGA1 FIFO High Threshold Select */
-static struct vga_regset iga1_fifo_high_threshold_select[] __devinitdata = {
+static struct vga_regset iga1_fifo_high_threshold_select[] = {
{ VGA_SEQ_I, 0x18, 0, 5 },
{ VGA_SEQ_I, 0x18, 7, 7 }
};
/* IGA2 FIFO High Threshold Select */
-static struct vga_regset iga2_fifo_high_threshold_select[] __devinitdata = {
+static struct vga_regset iga2_fifo_high_threshold_select[] = {
{ VGA_CRT_IC, 0x92, 0, 3 },
{ VGA_CRT_IC, 0x95, 0, 2 }
};
/* IGA1 FIFO display queue expire */
-static struct vga_regset iga1_display_queue_expire_num[] __devinitdata = {
+static struct vga_regset iga1_display_queue_expire_num[] = {
{ VGA_SEQ_I, 0x22, 0, 4 },
{ VGA_SEQ_I, 0x57, 6, 6 }
};
/* IGA2 FIFO display queue expire */
-static struct vga_regset iga2_display_queue_expire_num[] __devinitdata = {
+static struct vga_regset iga2_display_queue_expire_num[] = {
{ VGA_CRT_IC, 0x94, 0, 6 }
};
@@ -186,13 +186,13 @@ static struct vga_regset iga2_display_queue_expire_num[] __devinitdata = {
/***********************************************/
/* IGA1 Offset Register */
-static struct vga_regset iga1_offset[] __devinitdata = {
+static struct vga_regset iga1_offset[] = {
{ VGA_CRT_IC, 0x13, 0, 7 },
{ VGA_CRT_IC, 0x35, 5, 7 }
};
/* IGA2 Offset Register */
-static struct vga_regset iga2_offset[] __devinitdata = {
+static struct vga_regset iga2_offset[] = {
{ VGA_CRT_IC, 0x66, 0, 7 },
{ VGA_CRT_IC, 0x67, 0, 1 },
{ VGA_CRT_IC, 0x71, 7, 7 }
@@ -203,13 +203,13 @@ static struct vga_regset iga2_offset[] __devinitdata = {
/***********************************************/
/* IGA1 Fetch Count Register */
-static struct vga_regset iga1_fetch_count[] __devinitdata = {
+static struct vga_regset iga1_fetch_count[] = {
{ VGA_SEQ_I, 0x1C, 0, 7 },
{ VGA_SEQ_I, 0x1D, 0, 1 }
};
/* IGA2 Fetch Count Register */
-static struct vga_regset iga2_fetch_count[] __devinitdata = {
+static struct vga_regset iga2_fetch_count[] = {
{ VGA_CRT_IC, 0x65, 0, 7 },
{ VGA_CRT_IC, 0x67, 2, 3 }
};
@@ -295,43 +295,43 @@ static struct vga_regset lcd_ver_scaling[] = {
/************************************************/
/* IGA1 Horizontal Total */
-static struct vga_regset iga1_hor_total[] __devinitdata = {
+static struct vga_regset iga1_hor_total[] = {
{ VGA_CRT_IC, 0x00, 0, 7 },
{ VGA_CRT_IC, 0x36, 3, 3 }
};
/* IGA1 Horizontal Addressable Video */
-static struct vga_regset iga1_hor_addr[] __devinitdata = {
+static struct vga_regset iga1_hor_addr[] = {
{ VGA_CRT_IC, 0x01, 0, 7 },
{ VGA_CRT_IC, 0x45, 1, 1 }
};
/* IGA1 Horizontal Blank Start */
-static struct vga_regset iga1_hor_blank_start[] __devinitdata = {
+static struct vga_regset iga1_hor_blank_start[] = {
{ VGA_CRT_IC, 0x02, 0, 7 },
{ VGA_CRT_IC, 0x45, 2, 2 }
};
/* IGA1 Horizontal Blank End */
-static struct vga_regset iga1_hor_blank_end[] __devinitdata = {
+static struct vga_regset iga1_hor_blank_end[] = {
{ VGA_CRT_IC, 0x03, 0, 4 },
{ VGA_CRT_IC, 0x05, 7, 7 },
{ VGA_CRT_IC, 0x33, 5, 5 }
};
/* IGA1 Horizontal Sync Start */
-static struct vga_regset iga1_hor_sync_start[] __devinitdata = {
+static struct vga_regset iga1_hor_sync_start[] = {
{ VGA_CRT_IC, 0x04, 0, 7 },
{ VGA_CRT_IC, 0x33, 4, 4 }
};
/* IGA1 Horizontal Sync End */
-static struct vga_regset iga1_hor_sync_end[] __devinitdata = {
+static struct vga_regset iga1_hor_sync_end[] = {
{ VGA_CRT_IC, 0x05, 0, 4 }
};
/* IGA1 Vertical Total */
-static struct vga_regset iga1_ver_total[] __devinitdata = {
+static struct vga_regset iga1_ver_total[] = {
{ VGA_CRT_IC, 0x06, 0, 7 },
{ VGA_CRT_IC, 0x07, 0, 0 },
{ VGA_CRT_IC, 0x07, 5, 5 },
@@ -339,7 +339,7 @@ static struct vga_regset iga1_ver_total[] __devinitdata = {
};
/* IGA1 Vertical Addressable Video */
-static struct vga_regset iga1_ver_addr[] __devinitdata = {
+static struct vga_regset iga1_ver_addr[] = {
{ VGA_CRT_IC, 0x12, 0, 7 },
{ VGA_CRT_IC, 0x07, 1, 1 },
{ VGA_CRT_IC, 0x07, 6, 6 },
@@ -347,7 +347,7 @@ static struct vga_regset iga1_ver_addr[] __devinitdata = {
};
/* IGA1 Vertical Blank Start */
-static struct vga_regset iga1_ver_blank_start[] __devinitdata = {
+static struct vga_regset iga1_ver_blank_start[] = {
{ VGA_CRT_IC, 0x15, 0, 7 },
{ VGA_CRT_IC, 0x07, 3, 3 },
{ VGA_CRT_IC, 0x09, 5, 5 },
@@ -355,12 +355,12 @@ static struct vga_regset iga1_ver_blank_start[] __devinitdata = {
};
/* IGA1 Vertical Blank End */
-static struct vga_regset iga1_ver_blank_end[] __devinitdata = {
+static struct vga_regset iga1_ver_blank_end[] = {
{ VGA_CRT_IC, 0x16, 0, 7 }
};
/* IGA1 Vertical Sync Start */
-static struct vga_regset iga1_ver_sync_start[] __devinitdata = {
+static struct vga_regset iga1_ver_sync_start[] = {
{ VGA_CRT_IC, 0x10, 0, 7 },
{ VGA_CRT_IC, 0x07, 2, 2 },
{ VGA_CRT_IC, 0x07, 7, 7 },
@@ -368,7 +368,7 @@ static struct vga_regset iga1_ver_sync_start[] __devinitdata = {
};
/* IGA1 Vertical Sync End */
-static struct vga_regset iga1_ver_sync_end[] __devinitdata = {
+static struct vga_regset iga1_ver_sync_end[] = {
{ VGA_CRT_IC, 0x11, 0, 3 }
};
@@ -377,34 +377,34 @@ static struct vga_regset iga1_ver_sync_end[] __devinitdata = {
/************************************************/
/* IGA2 Horizontal Total */
-static struct vga_regset iga2_hor_total[] __devinitdata = {
+static struct vga_regset iga2_hor_total[] = {
{ VGA_CRT_IC, 0x50, 0, 7 },
{ VGA_CRT_IC, 0x55, 0, 3 }
};
/* IGA2 Horizontal Addressable Video */
-static struct vga_regset iga2_hor_addr[] __devinitdata = {
+static struct vga_regset iga2_hor_addr[] = {
{ VGA_CRT_IC, 0x51, 0, 7 },
{ VGA_CRT_IC, 0x55, 4, 6 },
{ VGA_CRT_IC, 0x55, 7, 7 }
};
/* IGA2 Horizontal Blank Start */
-static struct vga_regset iga2_hor_blank_start[] __devinitdata = {
+static struct vga_regset iga2_hor_blank_start[] = {
{ VGA_CRT_IC, 0x52, 0, 7 },
{ VGA_CRT_IC, 0x54, 0, 2 },
{ VGA_CRT_IC, 0x6B, 0, 0 }
};
/* IGA2 Horizontal Blank End */
-static struct vga_regset iga2_hor_blank_end[] __devinitdata = {
+static struct vga_regset iga2_hor_blank_end[] = {
{ VGA_CRT_IC, 0x53, 0, 7 },
{ VGA_CRT_IC, 0x54, 3, 5 },
{ VGA_CRT_IC, 0x5D, 6, 6 }
};
/* IGA2 Horizontal Sync Start */
-static struct vga_regset iga2_hor_sync_start[] __devinitdata = {
+static struct vga_regset iga2_hor_sync_start[] = {
{ VGA_CRT_IC, 0x56, 0, 7 },
{ VGA_CRT_IC, 0x54, 6, 7 },
{ VGA_CRT_IC, 0x5C, 7, 7 },
@@ -412,43 +412,43 @@ static struct vga_regset iga2_hor_sync_start[] __devinitdata = {
};
/* IGA2 Horizontal Sync End */
-static struct vga_regset iga2_hor_sync_end[] __devinitdata = {
+static struct vga_regset iga2_hor_sync_end[] = {
{ VGA_CRT_IC, 0x57, 0, 7 },
{ VGA_CRT_IC, 0x5C, 6, 6 }
};
/* IGA2 Vertical Total */
-static struct vga_regset iga2_ver_total[] __devinitdata = {
+static struct vga_regset iga2_ver_total[] = {
{ VGA_CRT_IC, 0x58, 0, 7 },
{ VGA_CRT_IC, 0x5D, 0, 2 }
};
/* IGA2 Vertical Addressable Video */
-static struct vga_regset iga2_ver_addr[] __devinitdata = {
+static struct vga_regset iga2_ver_addr[] = {
{ VGA_CRT_IC, 0x59, 0, 7 },
{ VGA_CRT_IC, 0x5D, 3, 5 }
};
/* IGA2 Vertical Blank Start */
-static struct vga_regset iga2_ver_blank_start[] __devinitdata = {
+static struct vga_regset iga2_ver_blank_start[] = {
{ VGA_CRT_IC, 0x5A, 0, 7 },
{ VGA_CRT_IC, 0x5C, 0, 2 }
};
/* IGA2 Vertical Blank End */
-static struct vga_regset iga2_ver_blank_end[] __devinitdata = {
+static struct vga_regset iga2_ver_blank_end[] = {
{ VGA_CRT_IC, 0x5B, 0, 7 },
{ VGA_CRT_IC, 0x5C, 3, 5 }
};
/* IGA2 Vertical Sync Start */
-static struct vga_regset iga2_ver_sync_start[] __devinitdata = {
+static struct vga_regset iga2_ver_sync_start[] = {
{ VGA_CRT_IC, 0x5E, 0, 7 },
{ VGA_CRT_IC, 0x5F, 5, 7 }
};
/* IGA2 Vertical Sync End */
-static struct vga_regset iga2_ver_sync_end[] __devinitdata = {
+static struct vga_regset iga2_ver_sync_end[] = {
{ VGA_CRT_IC, 0x5F, 0, 4 }
};
diff --git a/drivers/gpu/drm/via/via_display.c b/drivers/gpu/drm/via/via_display.c
index 29cdec1..331fa2c 100644
--- a/drivers/gpu/drm/via/via_display.c
+++ b/drivers/gpu/drm/via/via_display.c
@@ -453,7 +453,7 @@ via_display_init(struct drm_device *dev)
svga_wmisc_mask(VGABASE, BIT(0), BIT(0));
}
-int __devinit
+int
via_modeset_init(struct drm_device *dev)
{
struct drm_via_private *dev_priv = dev->dev_private;
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index f4c3db1..1a59260 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -21,7 +21,7 @@
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
-
+#include <linux/pci.h>
#include <linux/module.h>
#include <drm/drmP.h>
@@ -35,7 +35,7 @@ int via_modeset = 0;
MODULE_PARM_DESC(modeset, "Disable/Enable modesetting");
module_param_named(modeset, via_modeset, int, 0400);
-static struct pci_device_id via_pci_table[] __devinitdata = {
+static struct pci_device_id via_pci_table[] = {
viadrv_PCI_IDS,
};
MODULE_DEVICE_TABLE(pci, via_pci_table);
@@ -54,7 +54,7 @@ MODULE_DEVICE_TABLE(pci, via_pci_table);
#define VIA_AGP_1X_MODE 0x01
#define VIA_AGP_FW_MODE 0x10
-static int __devinit
+static int
via_detect_agp(struct drm_device *dev)
{
struct drm_via_private *dev_priv = dev->dev_private;
@@ -117,7 +117,7 @@ static void via_agp_engine_init(struct drm_via_private *dev_priv)
}
#endif
-static int __devinit
+static int
via_mmio_setup(struct drm_device *dev)
{
struct drm_via_private *dev_priv = dev->dev_private;
@@ -163,7 +163,7 @@ err:
return ret;
}
-static void __devinit
+static void
chip_revision_info(struct drm_device *dev)
{
struct drm_via_private *dev_priv = dev->dev_private;
@@ -299,7 +299,7 @@ static int via_driver_unload(struct drm_device *dev)
return ret;
}
-static int __devinit
+static int
via_driver_load(struct drm_device *dev, unsigned long chipset)
{
struct drm_via_private *dev_priv;
@@ -447,7 +447,7 @@ static struct drm_driver via_driver = {
.patchlevel = DRIVER_PATCHLEVEL,
};
-static int __devinit
+static int
via_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{
return drm_get_pci_dev(pdev, ent, &via_driver);
@@ -486,7 +486,7 @@ static int __init via_init(void)
if (via_modeset) {
via_pci_driver.probe = via_pci_probe;
- via_pci_driver.remove = __devexit_p(via_pci_remove);
+ via_pci_driver.remove = via_pci_remove;
#ifdef CONFIG_PM
via_pci_driver.suspend = via_pci_suspend;
via_pci_driver.resume = via_pci_resume;
More information about the Openchrome-devel
mailing list