From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ondrej Zary Subject: [PATCH] [resend] nouveau: Disable AGP for SiS 761 Date: Wed, 30 Sep 2015 13:48:21 +0200 Message-ID: <1443613701-30581-1-git-send-email-linux@rainbow-software.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Kernel development list , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: nouveau.vger.kernel.org U2lTIDc2MSBjaGlwc2V0IGRvZXMgbm90IHN1cHBvcnQgQUdQIGNhcmRzIGJ1dCBoYXMgQUdQIGNh cGFiaWxpdHkgKGZvcgp0aGUgb25ib2FyZCB2aWRlbykuIEF0IGxlYXN0IFBDIENoaXBzIEEzMUcg Ym9hcmQgdXNpbmcgdGhpcyBjaGlwc2V0IGhhcwphbiBBR1AtbGlrZSBBR1BybyBzbG90IHRoYXQn cyB3aXJlZCB0byB0aGUgUENJIGJ1cy4gRW5hYmxpbmcgQUdQIHdpbGwKZmFpbCAoR1BVIGxvY2t1 cCBhbmQgc29mdHdhcmUgZmJjb24sIFgxMSBoYW5ncykuCgpBZGQgc3VwcG9ydCBmb3IgbWF0Y2hp bmcganVzdCB0aGUgaG9zdCBicmlkZ2UgaW4gbnZrbV9kZXZpY2VfYWdwX3F1aXJrcwphbmQgYWRk IGVudHJ5IGZvciBTaVMgNzYxIHdpdGggbW9kZSAwIChBR1AgZGlzYWJsZWQpLgoKU2lnbmVkLW9m Zi1ieTogT25kcmVqIFphcnkgPGxpbnV4QHJhaW5ib3ctc29mdHdhcmUub3JnPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9ub3V2ZWF1L252a20vc3ViZGV2L3BjaS9hZ3AuYyB8ICAgIDggKysrKysrLS0K IDEgZmlsZSBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvcGNpL2FncC5jIGIvZHJp dmVycy9ncHUvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvcGNpL2FncC5jCmluZGV4IDgxNGNiNTEu LjM4NWE5MGYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L252a20vc3ViZGV2 L3BjaS9hZ3AuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udmttL3N1YmRldi9wY2kv YWdwLmMKQEAgLTM1LDYgKzM1LDggQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBudmttX2RldmljZV9h Z3BfcXVpcmsKIG52a21fZGV2aWNlX2FncF9xdWlya3NbXSA9IHsKIAkvKiBWSUEgQXBvbGxvIFBS TzEzM3ggLyBHZUZvcmNlIEZYIDU2MDAgVWx0cmEgLSBmZG8jMjAzNDEgKi8KIAl7IFBDSV9WRU5E T1JfSURfVklBLCAweDA2OTEsIFBDSV9WRU5ET1JfSURfTlZJRElBLCAweDAzMTEsIDIgfSwKKwkv KiBTaVMgNzYxIGRvZXMgbm90IHN1cHBvcnQgQUdQIGNhcmRzLCB1c2UgUENJIG1vZGUgKi8KKwl7 IFBDSV9WRU5ET1JfSURfU0ksIDB4MDc2MSwgUENJX0FOWV9JRCwgUENJX0FOWV9JRCwgMCB9LAog CXt9LAogfTsKIApAQCAtMTM3LDggKzEzOSwxMCBAQCBudmttX2FncF9jdG9yKHN0cnVjdCBudmtt X3BjaSAqcGNpKQogCXdoaWxlIChxdWlyay0+aG9zdGJyaWRnZV92ZW5kb3IpIHsKIAkJaWYgKGlu Zm8uZGV2aWNlLT52ZW5kb3IgPT0gcXVpcmstPmhvc3RicmlkZ2VfdmVuZG9yICYmCiAJCSAgICBp bmZvLmRldmljZS0+ZGV2aWNlID09IHF1aXJrLT5ob3N0YnJpZGdlX2RldmljZSAmJgotCQkgICAg cGNpLT5wZGV2LT52ZW5kb3IgPT0gcXVpcmstPmNoaXBfdmVuZG9yICYmCi0JCSAgICBwY2ktPnBk ZXYtPmRldmljZSA9PSBxdWlyay0+Y2hpcF9kZXZpY2UpIHsKKwkJICAgIChxdWlyay0+Y2hpcF92 ZW5kb3IgPT0gKHUxNilQQ0lfQU5ZX0lEIHx8CisJCSAgICBwY2ktPnBkZXYtPnZlbmRvciA9PSBx dWlyay0+Y2hpcF92ZW5kb3IpICYmCisJCSAgICAocXVpcmstPmNoaXBfZGV2aWNlID09ICh1MTYp UENJX0FOWV9JRCB8fAorCQkgICAgcGNpLT5wZGV2LT5kZXZpY2UgPT0gcXVpcmstPmNoaXBfZGV2 aWNlKSkgewogCQkJbnZrbV9pbmZvKHN1YmRldiwgImZvcmNpbmcgZGVmYXVsdCBhZ3AgbW9kZSB0 byAlZFgsICIKIAkJCQkJICAidXNlIE52QUdQPTxtb2RlPiB0byBvdmVycmlkZVxuIiwKIAkJCQkg IHF1aXJrLT5tb2RlKTsKLS0gCk9uZHJlaiBaYXJ5CgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpOb3V2ZWF1IG1haWxpbmcgbGlzdApOb3V2ZWF1QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vbm91dmVhdQo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756209AbbI3Lsl (ORCPT ); Wed, 30 Sep 2015 07:48:41 -0400 Received: from ns.gsystem.sk ([62.176.172.50]:54093 "EHLO gsystem.sk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753049AbbI3Lsf (ORCPT ); Wed, 30 Sep 2015 07:48:35 -0400 From: Ondrej Zary To: nouveau@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org, Kernel development list Subject: [PATCH] [resend] nouveau: Disable AGP for SiS 761 Date: Wed, 30 Sep 2015 13:48:21 +0200 Message-Id: <1443613701-30581-1-git-send-email-linux@rainbow-software.org> X-Mailer: git-send-email 1.7.10.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org SiS 761 chipset does not support AGP cards but has AGP capability (for the onboard video). At least PC Chips A31G board using this chipset has an AGP-like AGPro slot that's wired to the PCI bus. Enabling AGP will fail (GPU lockup and software fbcon, X11 hangs). Add support for matching just the host bridge in nvkm_device_agp_quirks and add entry for SiS 761 with mode 0 (AGP disabled). Signed-off-by: Ondrej Zary --- drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.c index 814cb51..385a90f 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.c @@ -35,6 +35,8 @@ static const struct nvkm_device_agp_quirk nvkm_device_agp_quirks[] = { /* VIA Apollo PRO133x / GeForce FX 5600 Ultra - fdo#20341 */ { PCI_VENDOR_ID_VIA, 0x0691, PCI_VENDOR_ID_NVIDIA, 0x0311, 2 }, + /* SiS 761 does not support AGP cards, use PCI mode */ + { PCI_VENDOR_ID_SI, 0x0761, PCI_ANY_ID, PCI_ANY_ID, 0 }, {}, }; @@ -137,8 +139,10 @@ nvkm_agp_ctor(struct nvkm_pci *pci) while (quirk->hostbridge_vendor) { if (info.device->vendor == quirk->hostbridge_vendor && info.device->device == quirk->hostbridge_device && - pci->pdev->vendor == quirk->chip_vendor && - pci->pdev->device == quirk->chip_device) { + (quirk->chip_vendor == (u16)PCI_ANY_ID || + pci->pdev->vendor == quirk->chip_vendor) && + (quirk->chip_device == (u16)PCI_ANY_ID || + pci->pdev->device == quirk->chip_device)) { nvkm_info(subdev, "forcing default agp mode to %dX, " "use NvAGP= to override\n", quirk->mode); -- Ondrej Zary