Attachment 85214 Details for Bug 50375 – add nv11 card type

[patch] add nv11 card type

0001-drm-nv10-introduce-a-new-NV_11-card-type.patch (text/plain), 3.62 KB, created by Ilia Mirkin on 2013-09-05 01:40:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ilia Mirkin

Created: 2013-09-05 01:40:10 UTC

Size: 3.62 KB

patch

obsolete

>From 07217f6664ba5a06843eb7b9513e862a6a39036c Mon Sep 17 00:00:00 2001
>From: Ilia Mirkin <imirkin@alum.mit.edu>
>Date: Wed, 4 Sep 2013 21:02:28 -0400
>Subject: [PATCH 1/2] drm/nv10: introduce a new NV_11 card type
>
>NV11/17/1F/18 come after NV10/15/16/1A. In order to facilitate using
>numerical comparisons, split up the two sets into different card types.
>
>This change should be a no-op except that the relevant cards will see
>NV11 printed instead of NV10 for the family.
>
>Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
>---
> drivers/gpu/drm/nouveau/core/engine/device/base.c  | 11 +++++++++--
> drivers/gpu/drm/nouveau/core/include/core/device.h |  1 +
> drivers/gpu/drm/nouveau/nouveau_abi16.c            |  1 +
> drivers/gpu/drm/nouveau/nouveau_connector.c        |  7 ++++---
> 4 files changed, 15 insertions(+), 5 deletions(-)
>
>diff --git a/drivers/gpu/drm/nouveau/core/engine/device/base.c b/drivers/gpu/drm/nouveau/core/engine/device/base.c
>index 4c72571..652cc3b 100644
>--- a/drivers/gpu/drm/nouveau/core/engine/device/base.c
>+++ b/drivers/gpu/drm/nouveau/core/engine/device/base.c
>@@ -161,7 +161,13 @@ nouveau_devobj_ctor(struct nouveau_object *parent,
> 		if ((boot0 & 0x0f000000) > 0) {
> 			device->chipset = (boot0 & 0xff00000) >> 20;
> 			switch (device->chipset & 0xf0) {
>-			case 0x10: device->card_type = NV_10; break;
>+			case 0x10: {
>+				if (0x461 & (1 << (device->chipset & 0xf)))
>+					device->card_type = NV_10;
>+				else
>+					device->card_type = NV_11;
>+				break;
>+			}
> 			case 0x20: device->card_type = NV_20; break;
> 			case 0x30: device->card_type = NV_30; break;
> 			case 0x40:
>@@ -188,7 +194,8 @@ nouveau_devobj_ctor(struct nouveau_object *parent,
> 
> 		switch (device->card_type) {
> 		case NV_04: ret = nv04_identify(device); break;
>-		case NV_10: ret = nv10_identify(device); break;
>+		case NV_10:
>+		case NV_11: ret = nv10_identify(device); break;
> 		case NV_20: ret = nv20_identify(device); break;
> 		case NV_30: ret = nv30_identify(device); break;
> 		case NV_40: ret = nv40_identify(device); break;
>diff --git a/drivers/gpu/drm/nouveau/core/include/core/device.h b/drivers/gpu/drm/nouveau/core/include/core/device.h
>index 99b6600..8601dea 100644
>--- a/drivers/gpu/drm/nouveau/core/include/core/device.h
>+++ b/drivers/gpu/drm/nouveau/core/include/core/device.h
>@@ -72,6 +72,7 @@ struct nouveau_device {
> 	enum {
> 		NV_04    = 0x04,
> 		NV_10    = 0x10,
>+		NV_11    = 0x11,
> 		NV_20    = 0x20,
> 		NV_30    = 0x30,
> 		NV_40    = 0x40,
>diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
>index 8f467e7..028e370 100644
>--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
>+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
>@@ -87,6 +87,7 @@ nouveau_abi16_swclass(struct nouveau_drm *drm)
> 	case NV_04:
> 		return 0x006e;
> 	case NV_10:
>+	case NV_11:
> 	case NV_20:
> 	case NV_30:
> 	case NV_40:
>diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
>index 4da776f..a6dedfa 100644
>--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
>+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
>@@ -212,9 +212,10 @@ nouveau_connector_set_encoder(struct drm_connector *connector,
> 	} else {
> 		connector->doublescan_allowed = true;
> 		if (nv_device(drm->device)->card_type == NV_20 ||
>-		   (nv_device(drm->device)->card_type == NV_10 &&
>-		    (dev->pci_device & 0x0ff0) != 0x0100 &&
>-		    (dev->pci_device & 0x0ff0) != 0x0150))
>+		    ((nv_device(drm->device)->card_type == NV_10 ||
>+		      nv_device(drm->device)->card_type == NV_11) &&
>+		     (dev->pci_device & 0x0ff0) != 0x0100 &&
>+		     (dev->pci_device & 0x0ff0) != 0x0150))
> 			/* HW is broken */
> 			connector->interlace_allowed = false;
> 		else
>-- 
>1.8.1.5
>

Actions: View | Splinter Review

Attachments on bug 50375: 62127 | 84758 | 85214 | 85215

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.