[Intel-gfx] i915 module does not find 82865G if configured as secondary

[Tempura San]

I have built the module with the lines removed. Now in dmesg I get these
lines, which look better to me:

[...] pci 0000:00:02.0: enabling device (0000 -> 0003)
[...] pci 0000:00:02.0: PCI INT A -> GSI 16 (level, low) -> IRQ 16
[...] pci 0000:00:02.0: setting latency timer to 64
[...] [drm] Initialized i915 1.6.0 20080730 for 0000:00:02.0 on minor 0

But in sysfs now the i915 does no longer show up, so I cannot check if
the driver was bound correctly.

Listing /sys/bus/pci/devices/0000:00:02.0 did not show any entries and
Xorg still does not start - same error as before.

Yours,
Tempura

On Sun, 9 Oct 2011 14:44:30 +0200, Daniel Vetter wrote:
> On Sun, Oct 09, 2011 at 01:07:25PM +0200, Tempura San wrote:
>> Here is the output of lspci -nn:
>>
>> 00:00.0 Host bridge [0600]: Intel Corporation 82865G/PE/P DRAM
>> Controller/Host-Hub Interface [8086:2570] (rev 02)
>> 00:02.0 Display controller [0380]: Intel Corporation 82865G Integrated
>> Graphics Controller [8086:2572] (rev 02)
> The issue seems to be that the igd isn't a VGA pci class device anymore
> when used as secondary. The below (untested) patch should allow to still
> bind the i915 driver. Please test how far that gets us.
>
> Yours, Daniel
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index ad85c13..6abb1d7 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -106,8 +106,6 @@ static struct drm_driver driver;
>  extern int intel_agp_enabled;
>  
>  #define INTEL_VGA_DEVICE(id, info) {		\
> -	.class = PCI_CLASS_DISPLAY_VGA << 8,	\
> -	.class_mask = 0xff0000,			\
>  	.vendor = 0x8086,			\
>  	.device = id,				\
>  	.subvendor = PCI_ANY_ID,		\
>