Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c549dc64 authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds
Browse files

[PATCH] nvidiafb: Add support for some pci-e chipsets 



Chipsets with PCI device ids & 0xf0 == 0x00f0 has their actual chipset type in
offset 0x1800 of the mmio space.  Add support for this.

Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a14b2283

drivers/video/nvidia/nvidia.c

+54 −21
Original line number Diff line number Diff line
@@ -284,6 +284,16 @@ static struct pci_device_id nvidiafb_pci_tbl[] = { 
	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6200,

	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{PCI_VENDOR_ID_NVIDIA, PCIE_DEVICE_ID_NVIDIA_GEFORCE_6800_ALT1,

	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{PCI_VENDOR_ID_NVIDIA, PCIE_DEVICE_ID_NVIDIA_GEFORCE_6600_ALT1,

	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{PCI_VENDOR_ID_NVIDIA, PCIE_DEVICE_ID_NVIDIA_GEFORCE_6600_ALT2,

	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{PCI_VENDOR_ID_NVIDIA, PCIE_DEVICE_ID_NVIDIA_GEFORCE_6200_ALT1,

	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{PCI_VENDOR_ID_NVIDIA, PCIE_DEVICE_ID_NVIDIA_GEFORCE_6800_GT,

	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{PCI_VENDOR_ID_NVIDIA, 0x0252,

	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{PCI_VENDOR_ID_NVIDIA, 0x0313,
@@ -1448,11 +1458,34 @@ static int __devinit nvidia_set_fbinfo(struct fb_info *info) 
	return nvidiafb_check_var(&info->var, info);

}



static u32 __devinit nvidia_get_arch(struct pci_dev *pd)

static u32 __devinit nvidia_get_chipset(struct fb_info *info)

{

	struct nvidia_par *par = info->par;

	u32 id = (par->pci_dev->vendor << 16) | par->pci_dev->device;



	printk("nvidiafb: PCI id - %x\n", id);

	if ((id & 0xfff0) == 0x00f0) {

		/* pci-e */

		printk("nvidiafb: PCI-E card\n");

		id = NV_RD32(par->REGS, 0x1800);



		if ((id & 0x0000ffff) == 0x000010DE)

			id = 0x10DE0000 | (id >> 16);

		else if ((id & 0xffff0000) == 0xDE100000) /* wrong endian */

			id = 0x10DE0000 | ((id << 8) & 0x0000ff00) |

                            ((id >> 8) & 0x000000ff);

	}



	printk("nvidiafb: Actual id - %x\n", id);

	return id;

}



static u32 __devinit nvidia_get_arch(struct fb_info *info)

{

	struct nvidia_par *par = info->par;

	u32 arch = 0;



	switch (pd->device & 0x0ff0) {

	switch (par->Chipset & 0x0ff0) {

	case 0x0100:		/* GeForce 256 */

	case 0x0110:		/* GeForce2 MX */

	case 0x0150:		/* GeForce2 */
@@ -1535,18 +1568,6 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd, 
		goto err_out_request;

	}



	par->Architecture = nvidia_get_arch(pd);



	par->Chipset = (pd->vendor << 16) | pd->device;

	printk(KERN_INFO PFX "nVidia device/chipset %X\n", par->Chipset);



	if (par->Architecture == 0) {

		printk(KERN_ERR PFX "unknown NV_ARCH\n");

		goto err_out_free_base0;

	}



	sprintf(nvidiafb_fix.id, "NV%x", (pd->device & 0x0ff0) >> 4);



	par->FlatPanel = flatpanel;

	if (flatpanel == 1)

		printk(KERN_INFO PFX "flatpanel support enabled\n");
@@ -1572,6 +1593,17 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd, 
		goto err_out_free_base0;

	}



	par->Chipset = nvidia_get_chipset(info);

	printk(KERN_INFO PFX "nVidia device/chipset %X\n", par->Chipset);

	par->Architecture = nvidia_get_arch(info);



	if (par->Architecture == 0) {

		printk(KERN_ERR PFX "unknown NV_ARCH\n");

		goto err_out_arch;

	}



	sprintf(nvidiafb_fix.id, "NV%x", (pd->device & 0x0ff0) >> 4);



	NVCommonSetup(info);



	par->FbAddress = nvidiafb_fix.smem_start;
@@ -1652,6 +1684,7 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd, 
err_out_free_base1:

	fb_destroy_modedb(info->monspecs.modedb);

	nvidia_delete_i2c_busses(par);

err_out_arch:

	iounmap(par->REGS);

err_out_free_base0:

	pci_release_regions(pd);

include/linux/pci_ids.h

+5 −0
Original line number Diff line number Diff line
@@ -1050,6 +1050,11 @@ 
#define PCI_DEVICE_ID_NVIDIA_NVENET_6		0x00e6

#define PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO		0x00ea

#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2	0x00ee

#define PCIE_DEVICE_ID_NVIDIA_GEFORCE_6800_ALT1 0x00f0

#define PCIE_DEVICE_ID_NVIDIA_GEFORCE_6600_ALT1 0x00f1

#define PCIE_DEVICE_ID_NVIDIA_GEFORCE_6600_ALT2 0x00f2

#define PCIE_DEVICE_ID_NVIDIA_GEFORCE_6200_ALT1 0x00f3

#define PCIE_DEVICE_ID_NVIDIA_GEFORCE_6800_GT   0x00f9

#define PCI_DEVICE_ID_NVIDIA_GEFORCE_SDR	0x0100

#define PCI_DEVICE_ID_NVIDIA_GEFORCE_DDR	0x0101

#define PCI_DEVICE_ID_NVIDIA_QUADRO		0x0103