Attachment 144059 Details for Bug 191206 – Try to map Video BIOS in intel_bios.c (V2)

[patch] Try to map Video BIOS in intel_bios.c (V2)

drm-i915-map-vbios.b.patch (text/plain), 1.38 KB, created by Jean-Sébastien Pédron on 2014-06-23 09:16:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jean-Sébastien Pédron

Created: 2014-06-23 09:16:35 UTC

Size: 1.38 KB

patch

obsolete

>diff --git a/sys/dev/drm2/i915/intel_bios.c b/sys/dev/drm2/i915/intel_bios.c
>index 8bf38a5..134cb09 100644
>--- a/sys/dev/drm2/i915/intel_bios.c
>+++ b/sys/dev/drm2/i915/intel_bios.c
>@@ -653,6 +653,7 @@ intel_parse_bios(struct drm_device *dev)
> 	struct drm_i915_private *dev_priv = dev->dev_private;
> 	struct bdb_header *bdb = NULL;
> 	u8 *bios;
>+	device_t vga_dev;
> 
> 	init_vbt_defaults(dev_priv);
> 
>@@ -668,18 +669,13 @@ intel_parse_bios(struct drm_device *dev)
> 	}
> 	bios = NULL;
> 
>-#if 1
>-	if (bdb == NULL) {
>-		KIB_NOTYET();
>-		return (-1);
>-	}
>-#else
> 	if (bdb == NULL) {
> 		struct vbt_header *vbt = NULL;
> 		size_t size;
> 		int i;
> 
>-		bios = pci_map_rom(pdev, &size);
>+		vga_dev = device_get_parent(dev->device);
>+		bios = vga_pci_map_bios(vga_dev, &size);
> 		if (!bios)
> 			return -1;
> 
>@@ -693,13 +689,12 @@ intel_parse_bios(struct drm_device *dev)
> 
> 		if (!vbt) {
> 			DRM_DEBUG_DRIVER("VBT signature missing\n");
>-			pci_unmap_rom(pdev, bios);
>+			vga_pci_unmap_bios(vga_dev, bios);
> 			return -1;
> 		}
> 
> 		bdb = (struct bdb_header *)(bios + i + vbt->bdb_offset);
> 	}
>-#endif
> 
> 	/* Grab useful general definitions */
> 	parse_general_features(dev_priv, bdb);
>@@ -711,10 +706,8 @@ intel_parse_bios(struct drm_device *dev)
> 	parse_driver_features(dev_priv, bdb);
> 	parse_edp(dev_priv, bdb);
> 
>-#if 0
> 	if (bios)
>-		pci_unmap_rom(pdev, bios);
>-#endif
>+		vga_pci_unmap_bios(vga_dev, bios);
> 
> 	return 0;
> }

Actions: View | Diff

Attachments on bug 191206: 143958 | 144059 | 144155 | 145179 | 145180 | 145183 | 145184