The patch titled
nvidiafb: Add support for Geforce 6100 and related chipsets
has been removed from the -mm tree. Its filename is
nvidiafb-add-support-for-geforce-6100-and-related-chipsets.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: nvidiafb: Add support for Geforce 6100 and related chipsets
From: "Antonino A. Daplas" <adaplas@xxxxxxxxx>
Add support for Geforce 6100 and related chipsets (PCI device id 0x024x)
Signed-off-by: Antonino Daplas <adaplas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/video/nvidia/nv_hw.c | 10 ++++++++--
drivers/video/nvidia/nvidia.c | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
diff -puN drivers/video/nvidia/nv_hw.c~nvidiafb-add-support-for-geforce-6100-and-related-chipsets drivers/video/nvidia/nv_hw.c
--- a/drivers/video/nvidia/nv_hw.c~nvidiafb-add-support-for-geforce-6100-and-related-chipsets
+++ a/drivers/video/nvidia/nv_hw.c
@@ -886,7 +886,10 @@ void NVCalcStateExt(struct nvidia_par *p
case NV_ARCH_20:
case NV_ARCH_30:
default:
- if (((par->Chipset & 0xffff) == 0x01A0) ||
+ if ((par->Chipset & 0xfff0) == 0x0240) {
+ state->arbitration0 = 256;
+ state->arbitration1 = 0x0480;
+ } else if (((par->Chipset & 0xffff) == 0x01A0) ||
((par->Chipset & 0xffff) == 0x01f0)) {
nForceUpdateArbitrationSettings(VClk,
pixelDepth * 8,
@@ -1235,6 +1238,7 @@ void NVLoadStateExt(struct nvidia_par *p
break;
case 0x0160:
case 0x01D0:
+ case 0x0240:
NV_WR32(par->PMC, 0x1700,
NV_RD32(par->PFB, 0x020C));
NV_WR32(par->PMC, 0x1704, 0);
@@ -1359,7 +1363,9 @@ void NVLoadStateExt(struct nvidia_par *p
if(((par->Chipset & 0xfff0)
!= 0x0160) &&
((par->Chipset & 0xfff0)
- != 0x0220))
+ != 0x0220) &&
+ ((par->Chipset & 0xfff0)
+ != 0x240))
NV_WR32(par->PGRAPH,
0x6900 + i*4,
NV_RD32(par->PFB,
diff -puN drivers/video/nvidia/nvidia.c~nvidiafb-add-support-for-geforce-6100-and-related-chipsets drivers/video/nvidia/nvidia.c
--- a/drivers/video/nvidia/nvidia.c~nvidiafb-add-support-for-geforce-6100-and-related-chipsets
+++ a/drivers/video/nvidia/nvidia.c
@@ -1171,6 +1171,7 @@ static u32 __devinit nvidia_get_arch(str
case 0x0210:
case 0x0220:
case 0x0230:
+ case 0x0240:
case 0x0290:
case 0x0390:
arch = NV_ARCH_40;
_
Patches currently in -mm which might be from adaplas@xxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
