From mboxrd@z Thu Jan 1 00:00:00 1970 From: Samuel Pitoiset Subject: Re: [PATCH] [resend] nouveau: Disable AGP for SiS 761 Date: Wed, 30 Sep 2015 13:52:25 +0200 Message-ID: <560BCCF9.6040303@gmail.com> References: <1443613701-30581-1-git-send-email-linux@rainbow-software.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1443613701-30581-1-git-send-email-linux-ZCIryABCsrmttCpgsWEBFmD2FQJk+8+b@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: Ondrej Zary , nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Kernel development list , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: nouveau.vger.kernel.org VGhpcyBwYXRjaCBoYXMgYmVlbiBtZXJnZWQgYnkgQmVuIHllc3RlcmRheS4KCmh0dHA6Ly9jZ2l0 LmZyZWVkZXNrdG9wLm9yZy9+ZGFya3RhbWEvbm91dmVhdS9jb21taXQvP2lkPThjNzEzZjkwYTYz ZmZjYTEwZDEyMmFmMDlkNDM5ZjM0MDljOTMzZWQKCldoeSBkbyB5b3Ugc2VuZCBhIG5ldyB2ZXJz aW9uID8gSXMgdGhlIHByZXZpb3VzIHBhdGNoIHdyb25nPwoKT24gMDkvMzAvMjAxNSAwMTo0OCBQ TSwgT25kcmVqIFphcnkgd3JvdGU6Cj4gU2lTIDc2MSBjaGlwc2V0IGRvZXMgbm90IHN1cHBvcnQg QUdQIGNhcmRzIGJ1dCBoYXMgQUdQIGNhcGFiaWxpdHkgKGZvcgo+IHRoZSBvbmJvYXJkIHZpZGVv KS4gQXQgbGVhc3QgUEMgQ2hpcHMgQTMxRyBib2FyZCB1c2luZyB0aGlzIGNoaXBzZXQgaGFzCj4g YW4gQUdQLWxpa2UgQUdQcm8gc2xvdCB0aGF0J3Mgd2lyZWQgdG8gdGhlIFBDSSBidXMuIEVuYWJs aW5nIEFHUCB3aWxsCj4gZmFpbCAoR1BVIGxvY2t1cCBhbmQgc29mdHdhcmUgZmJjb24sIFgxMSBo YW5ncykuCj4KPiBBZGQgc3VwcG9ydCBmb3IgbWF0Y2hpbmcganVzdCB0aGUgaG9zdCBicmlkZ2Ug aW4gbnZrbV9kZXZpY2VfYWdwX3F1aXJrcwo+IGFuZCBhZGQgZW50cnkgZm9yIFNpUyA3NjEgd2l0 aCBtb2RlIDAgKEFHUCBkaXNhYmxlZCkuCj4KPiBTaWduZWQtb2ZmLWJ5OiBPbmRyZWogWmFyeSA8 bGludXhAcmFpbmJvdy1zb2Z0d2FyZS5vcmc+Cj4gLS0tCj4gICBkcml2ZXJzL2dwdS9kcm0vbm91 dmVhdS9udmttL3N1YmRldi9wY2kvYWdwLmMgfCAgICA4ICsrKysrKy0tCj4gICAxIGZpbGUgY2hh bmdlZCwgNiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9ub3V2ZWF1L252a20vc3ViZGV2L3BjaS9hZ3AuYyBiL2RyaXZlcnMvZ3B1 L2RybS9ub3V2ZWF1L252a20vc3ViZGV2L3BjaS9hZ3AuYwo+IGluZGV4IDgxNGNiNTEuLjM4NWE5 MGYgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvcGNp L2FncC5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvcGNpL2Fn cC5jCj4gQEAgLTM1LDYgKzM1LDggQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBudmttX2RldmljZV9h Z3BfcXVpcmsKPiAgIG52a21fZGV2aWNlX2FncF9xdWlya3NbXSA9IHsKPiAgIAkvKiBWSUEgQXBv bGxvIFBSTzEzM3ggLyBHZUZvcmNlIEZYIDU2MDAgVWx0cmEgLSBmZG8jMjAzNDEgKi8KPiAgIAl7 IFBDSV9WRU5ET1JfSURfVklBLCAweDA2OTEsIFBDSV9WRU5ET1JfSURfTlZJRElBLCAweDAzMTEs IDIgfSwKPiArCS8qIFNpUyA3NjEgZG9lcyBub3Qgc3VwcG9ydCBBR1AgY2FyZHMsIHVzZSBQQ0kg bW9kZSAqLwo+ICsJeyBQQ0lfVkVORE9SX0lEX1NJLCAweDA3NjEsIFBDSV9BTllfSUQsIFBDSV9B TllfSUQsIDAgfSwKPiAgIAl7fSwKPiAgIH07Cj4gICAKPiBAQCAtMTM3LDggKzEzOSwxMCBAQCBu dmttX2FncF9jdG9yKHN0cnVjdCBudmttX3BjaSAqcGNpKQo+ICAgCXdoaWxlIChxdWlyay0+aG9z dGJyaWRnZV92ZW5kb3IpIHsKPiAgIAkJaWYgKGluZm8uZGV2aWNlLT52ZW5kb3IgPT0gcXVpcmst Pmhvc3RicmlkZ2VfdmVuZG9yICYmCj4gICAJCSAgICBpbmZvLmRldmljZS0+ZGV2aWNlID09IHF1 aXJrLT5ob3N0YnJpZGdlX2RldmljZSAmJgo+IC0JCSAgICBwY2ktPnBkZXYtPnZlbmRvciA9PSBx dWlyay0+Y2hpcF92ZW5kb3IgJiYKPiAtCQkgICAgcGNpLT5wZGV2LT5kZXZpY2UgPT0gcXVpcmst PmNoaXBfZGV2aWNlKSB7Cj4gKwkJICAgIChxdWlyay0+Y2hpcF92ZW5kb3IgPT0gKHUxNilQQ0lf QU5ZX0lEIHx8Cj4gKwkJICAgIHBjaS0+cGRldi0+dmVuZG9yID09IHF1aXJrLT5jaGlwX3ZlbmRv cikgJiYKPiArCQkgICAgKHF1aXJrLT5jaGlwX2RldmljZSA9PSAodTE2KVBDSV9BTllfSUQgfHwK PiArCQkgICAgcGNpLT5wZGV2LT5kZXZpY2UgPT0gcXVpcmstPmNoaXBfZGV2aWNlKSkgewo+ICAg CQkJbnZrbV9pbmZvKHN1YmRldiwgImZvcmNpbmcgZGVmYXVsdCBhZ3AgbW9kZSB0byAlZFgsICIK PiAgIAkJCQkJICAidXNlIE52QUdQPTxtb2RlPiB0byBvdmVycmlkZVxuIiwKPiAgIAkJCQkgIHF1 aXJrLT5tb2RlKTsKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCk5vdXZlYXUgbWFpbGluZyBsaXN0Ck5vdXZlYXVAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9ub3V2ZWF1Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932244AbbI3L5L (ORCPT ); Wed, 30 Sep 2015 07:57:11 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:33321 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754547AbbI3L5G (ORCPT ); Wed, 30 Sep 2015 07:57:06 -0400 Subject: Re: [Nouveau] [PATCH] [resend] nouveau: Disable AGP for SiS 761 To: Ondrej Zary , nouveau@lists.freedesktop.org References: <1443613701-30581-1-git-send-email-linux@rainbow-software.org> Cc: Kernel development list , dri-devel@lists.freedesktop.org From: Samuel Pitoiset Message-ID: <560BCCF9.6040303@gmail.com> Date: Wed, 30 Sep 2015 13:52:25 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <1443613701-30581-1-git-send-email-linux@rainbow-software.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch has been merged by Ben yesterday. http://cgit.freedesktop.org/~darktama/nouveau/commit/?id=8c713f90a63ffca10d122af09d439f3409c933ed Why do you send a new version ? Is the previous patch wrong? On 09/30/2015 01:48 PM, Ondrej Zary wrote: > 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);