gma500: Final enables for Oaktrail
Subsystems (3)
PATCH 1/1 gma500: Final enables for Oaktrail
From: Alan Cox <[email protected]>
This switches the ifdef to match the Kconfig so that Oaktrail probing occurs and adds some additional minor bulletproofing.
Tested on a Fujtisu Stylistic Q550 internal display. HDMI might work but that remains to be seen.
Signed-off-by Alan Cox <[email protected]>
---
drivers/gpu/drm/gma500/mid_bios.c | 14 ++++++++++++++ drivers/gpu/drm/gma500/psb_drv.c | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-)
drivers/gpu/drm/gma500/mid_bios.c +14 -0
@@ -45,6 +45,12 @@ static void mid_get_fuse_settings(struct drm_device *dev)#define FB_SKU_100 0#define FB_SKU_100L 1#define FB_SKU_83 2 +if (pci_root ==NULL ) { +WARN_ON (1 ); +return ; + } + +pci_write_config_dword (pci_root,0xD0 ,FB_REG06 );pci_read_config_dword (pci_root,0xD4 , &fuse_value);
@@ -101,6 +107,10 @@ static void mid_get_pci_revID(struct drm_psb_private *dev_priv)uint32_t platform_rev_id =0 ;struct pci_dev *pci_gfx_root =pci_get_bus_and_slot (0 ,PCI_DEVFN (2 ,0 )); +if (pci_gfx_root ==NULL ) { +WARN_ON (1 ); +return ; + }pci_read_config_dword (pci_gfx_root,0x08 , &platform_rev_id); dev_priv->platform_rev_id = (uint8_t ) platform_rev_id;pci_dev_put (pci_gfx_root);
@@ -138,6 +148,10 @@ static void mid_get_vbt_data(struct drm_psb_private *dev_priv)/* get the virtual address of the vbt */ vbt_virtual =ioremap (addr,sizeof (*vbt)); +if (vbt_virtual ==NULL ) { + vbt->size =0 ; +return ; + }memcpy (vbt, vbt_virtual,sizeof (*vbt));iounmap (vbt_virtual);/* Free virtual address space */
drivers/gpu/drm/gma500/psb_drv.c +1 -1
@@ -52,7 +52,7 @@ module_param_named(trap_pagefaults, drm_psb_trap_pagefaults, int, 0600);static DEFINE_PCI_DEVICE_TABLE (pciidlist) = { {0x8086 ,0x8108 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , (long ) &psb_chip_ops }, {0x8086 ,0x8109 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , (long ) &psb_chip_ops }, -#if defined(CONFIG_DRM_OAKTRAIL) +#if defined(CONFIG_DRM_GMA600) {0x8086 ,0x4100 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , (long ) &oaktrail_chip_ops}, {0x8086 ,0x4101 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , (long ) &oaktrail_chip_ops}, { 0x8086, 0x4102, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &oaktrail_chip_ops},
Dave Airlie
AppliedQuoted 8 lines
This switches the ifdef to match the
Kconfigso that Oaktrail probing occurs and adds some additional minor bulletproofing.Tested on a Fujtisu Stylistic Q550 internal display. HDMI might work but that remains to be seen.
Signed-off-by Alan Cox <[email protected]> ---
Applied to -next.
Dave.