Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751674AbcLLLoT (ORCPT ); Mon, 12 Dec 2016 06:44:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37570 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750712AbcLLLoS (ORCPT ); Mon, 12 Dec 2016 06:44:18 -0500 Subject: Re: [PATCH] drm/nouveau: fix unknown chipset for GTX 1060 To: Chris Chiu , David Airlie , Alexandre Courbot , Karol Herbst , Martin Peres , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <1481541993-40287-1-git-send-email-chiu@endlessm.com> Cc: linux@endlessm.com From: Ben Skeggs Message-ID: Date: Mon, 12 Dec 2016 21:44:13 +1000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <1481541993-40287-1-git-send-email-chiu@endlessm.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="uutoAr8v8kpJOvqhtBPi1HmEkQlGwLMuM" X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 12 Dec 2016 11:44:17 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4390 Lines: 117 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --uutoAr8v8kpJOvqhtBPi1HmEkQlGwLMuM Content-Type: multipart/mixed; boundary="73kBIt0gF0jQ8peatns6ExxXTfueXSaCt" From: Ben Skeggs To: Chris Chiu , David Airlie , Alexandre Courbot , Karol Herbst , Martin Peres , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: linux@endlessm.com Message-ID: Subject: Re: [PATCH] drm/nouveau: fix unknown chipset for GTX 1060 References: <1481541993-40287-1-git-send-email-chiu@endlessm.com> In-Reply-To: <1481541993-40287-1-git-send-email-chiu@endlessm.com> --73kBIt0gF0jQ8peatns6ExxXTfueXSaCt Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 12/12/2016 09:26 PM, Chris Chiu wrote: > Nouveau driver shows unknown chipset (136000a1) for GTX 1060, so it > only gives VGA resolution on screen. Use the same chipset as nv134 > then it shows FullHD. This commit copies fields from nv134_chipset > to nv136_chipset for GTX 1060. I have one of these sitting on my desk, but won't be merging support for it until it's been confirmed that no additional changes are required vs GP104. We've been bitten by just making these kind of blind assumptions before. Thanks, Ben. >=20 > Signed-off-by: Chris Chiu > --- > drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 29 +++++++++++++++= ++++++++ > 1 file changed, 29 insertions(+) >=20 > diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/driver= s/gpu/drm/nouveau/nvkm/engine/device/base.c > index 7218a06..7c6eece 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > @@ -2209,6 +2209,34 @@ nv134_chipset =3D { > .fifo =3D gp100_fifo_new, > }; > =20 > +static const struct nvkm_device_chip > +nv136_chipset =3D { > + .name =3D "GP104", > + .bar =3D gf100_bar_new, > + .bios =3D nvkm_bios_new, > + .bus =3D gf100_bus_new, > + .devinit =3D gm200_devinit_new, > + .fb =3D gp104_fb_new, > + .fuse =3D gm107_fuse_new, > + .gpio =3D gk104_gpio_new, > + .i2c =3D gm200_i2c_new, > + .ibus =3D gm200_ibus_new, > + .imem =3D nv50_instmem_new, > + .ltc =3D gp100_ltc_new, > + .mc =3D gp100_mc_new, > + .mmu =3D gf100_mmu_new, > + .pci =3D gp100_pci_new, > + .timer =3D gk20a_timer_new, > + .top =3D gk104_top_new, > + .ce[0] =3D gp104_ce_new, > + .ce[1] =3D gp104_ce_new, > + .ce[2] =3D gp104_ce_new, > + .ce[3] =3D gp104_ce_new, > + .disp =3D gp104_disp_new, > + .dma =3D gf119_dma_new, > + .fifo =3D gp100_fifo_new, > +}; > + > static int > nvkm_device_event_ctor(struct nvkm_object *object, void *data, u32 siz= e, > struct nvkm_notify *notify) > @@ -2644,6 +2672,7 @@ nvkm_device_ctor(const struct nvkm_device_func *f= unc, > case 0x12b: device->chip =3D &nv12b_chipset; break; > case 0x130: device->chip =3D &nv130_chipset; break; > case 0x134: device->chip =3D &nv134_chipset; break; > + case 0x136: device->chip =3D &nv136_chipset; break; > default: > nvdev_error(device, "unknown chipset (%08x)\n", boot0); > goto done; >=20 --73kBIt0gF0jQ8peatns6ExxXTfueXSaCt-- --uutoAr8v8kpJOvqhtBPi1HmEkQlGwLMuM Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEETp/uv2nr9kIVth0/dgucYlCSkfsFAlhOjY0ACgkQdgucYlCS kftr6RAA2G5A79R+Va3HoyD/SZvZCAFG5VnRQ0LARH3EWzLibqXHgLbU7SBPpzpH 96GqqNsi1CK5ceF0jHly3dyMtatxbRPRf1Za3oOjZ0WmDScEkaINJ4cQ+UDZz/u9 drU2ZdR8hBBoQM8e0h8IO433s+heFyZlrGALP6LXPtbKJt4uxmBEWxNwWVd1+5Wx QQK7PXJ2sLX6ItmqG7IDDwMQV4GKrxf9fzrd4p98YZlRKypM9Fg75ej1eXf2qjw9 DeNi8Yv1WkokpGZ8ZE5WYzACFBba1wsMEJlMIUruBwSusMMB+InU+4Op18XvBVVU Ort3N4zaprvuWrUxYprz9RrwlemYvgd2SuYDoavIrsiToeUvlh9MkGuv0i5no16V ryAu9T2feMGAdHtH4d2Kbn4DAAGeUBKVMGl1vr1rjCq+0+mvewBnQiVBjwk3z1Xz q1jvEwnzE0eGXIpVZiGiDYs2riVEC9hIYaKK44PIVBjJnrq5NGLZQcCLzQjsZlAJ ZP5KLzVGvSsp25GhB+ZuOzUuL0a7TB25AMYQi6ScQLXQf5qFICLwWq5r1lYjh4GW 9Cg++MP4O9XJBamnyhALljp51t1J5FqfB+UirZrM2iaT6ZiEMgZI933k8yf4kuuh Q7/8y5EraREXgpW1n0qGK88HaIHxDcxNzdzXxxc0+9dFFbCaFfw= =X9NF -----END PGP SIGNATURE----- --uutoAr8v8kpJOvqhtBPi1HmEkQlGwLMuM--