All of lore.kernel.org
 help / color / mirror / Atom feed
From: Samuel Pitoiset <samuel.pitoiset-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Ondrej Zary
	<linux-ZCIryABCsrmttCpgsWEBFmD2FQJk+8+b@public.gmane.org>,
	nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Kernel development list
	<linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Subject: Re: [PATCH] [resend] nouveau: Disable AGP for SiS 761
Date: Wed, 30 Sep 2015 13:52:25 +0200	[thread overview]
Message-ID: <560BCCF9.6040303@gmail.com> (raw)
In-Reply-To: <1443613701-30581-1-git-send-email-linux-ZCIryABCsrmttCpgsWEBFmD2FQJk+8+b@public.gmane.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 <linux@rainbow-software.org>
> ---
>   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=<mode> to override\n",
>   				  quirk->mode);

_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/nouveau

WARNING: multiple messages have this Message-ID (diff)
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
To: Ondrej Zary <linux@rainbow-software.org>, nouveau@lists.freedesktop.org
Cc: Kernel development list <linux-kernel@vger.kernel.org>,
	dri-devel@lists.freedesktop.org
Subject: Re: [Nouveau] [PATCH] [resend] nouveau: Disable AGP for SiS 761
Date: Wed, 30 Sep 2015 13:52:25 +0200	[thread overview]
Message-ID: <560BCCF9.6040303@gmail.com> (raw)
In-Reply-To: <1443613701-30581-1-git-send-email-linux@rainbow-software.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 <linux@rainbow-software.org>
> ---
>   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=<mode> to override\n",
>   				  quirk->mode);


  parent reply	other threads:[~2015-09-30 11:52 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-30 11:48 [PATCH] [resend] nouveau: Disable AGP for SiS 761 Ondrej Zary
2015-09-30 11:48 ` Ondrej Zary
     [not found] ` <1443613701-30581-1-git-send-email-linux-ZCIryABCsrmttCpgsWEBFmD2FQJk+8+b@public.gmane.org>
2015-09-30 11:52   ` Samuel Pitoiset [this message]
2015-09-30 11:52     ` [Nouveau] " Samuel Pitoiset
     [not found]     ` <560BCCF9.6040303-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-09-30 12:36       ` Ondrej Zary
2015-09-30 12:36         ` [Nouveau] " Ondrej Zary

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=560BCCF9.6040303@gmail.com \
    --to=samuel.pitoiset-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    --cc=linux-ZCIryABCsrmttCpgsWEBFmD2FQJk+8+b@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.