From patchwork Mon Dec 12 11:26:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Chiu X-Patchwork-Id: 9471637 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F0293607EE for ; Tue, 13 Dec 2016 00:44:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E16DF28531 for ; Tue, 13 Dec 2016 00:44:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D448A28542; Tue, 13 Dec 2016 00:44:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 44A2628531 for ; Tue, 13 Dec 2016 00:44:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6AC1A6E3FA; Tue, 13 Dec 2016 00:44:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf0-x230.google.com (mail-pf0-x230.google.com [IPv6:2607:f8b0:400e:c00::230]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4A6EE89B0B for ; Mon, 12 Dec 2016 11:26:44 +0000 (UTC) Received: by mail-pf0-x230.google.com with SMTP id i88so12622437pfk.2 for ; Mon, 12 Dec 2016 03:26:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessm-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=K/KScheCeLk909yHQNm0yOoCgNN348UVSz3tYOmlqXE=; b=dOf5bMDdcDgJ9QtP3ja3CeH7cvRrZNcscCyGGnE8gbQF9jSdvxo3IACpm+TEsaaXC2 HPx2wq9zKbBcFTROpiFFXcjMLJNZxUt7YtIMJhHKihrnRNMdtPlJbcmZK/2xPnYvlDy4 CkMUpw0vH6U3z9lmD6tX8DEL6vKSJ7M9ssNZW9qVW7h+IcuC0yCZCqFXzWdy6OYh9POa ZD+4kAQgDGh3A2RqwEtXE9P0zNAuipNCRvbcgLtsgYto6QRPB4sLIA7mObS5ZQ9EPdzh WbIf6lcQVgegdt0TVCwHlyJ/QOcsYkLCsj4VyPZiUrs2BMDIEEvHd7ant0Cnv+tMq4Nq 4w2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=K/KScheCeLk909yHQNm0yOoCgNN348UVSz3tYOmlqXE=; b=mmFDiaxs+I6FuXLT8r1X98GdxGGGaSTa2yiV9Am9jksM4mYRgNcIJ9imJK/lScdbaa sb1RWT7WNPzdja1/MmTugoIDjk2VZEhi3h+bk+uWEfmCzUP6yhlN43nI/Hp/jbcALB3N CNhVicqpPfPES8+1do0i21ope0gArk/oUjFhID0E++/ZecomOsUJhipDyTK0EehIFS6T NLOn48wuDEDSJHqmxlKh2EU6TJHuyU2tuCrF53EE9LKFV56Y3hXLwnid/rqaGQUHPSrr ibU2FOkM4YXacfPcqtEpcWtaU+7IeNT+CwADrjxGJzETcX5mBocHJs0yBoJ/JC6rlEwE u6sg== X-Gm-Message-State: AKaTC00qVT9nlYsAKL1dxI3J8IkuQy3xDaxlDDdgZmueufRSo/51spJEFtHUlbJRezjTMEKm X-Received: by 10.84.218.15 with SMTP id q15mr185115528pli.143.1481542003649; Mon, 12 Dec 2016 03:26:43 -0800 (PST) Received: from localhost.localdomain (61-224-120-165.dynamic.hinet.net. [61.224.120.165]) by smtp.gmail.com with ESMTPSA id 186sm75619489pfv.61.2016.12.12.03.26.40 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 12 Dec 2016 03:26:43 -0800 (PST) From: Chris Chiu To: Ben Skeggs , David Airlie , Alexandre Courbot , Karol Herbst , Martin Peres , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/nouveau: fix unknown chipset for GTX 1060 Date: Mon, 12 Dec 2016 19:26:33 +0800 Message-Id: <1481541993-40287-1-git-send-email-chiu@endlessm.com> X-Mailer: git-send-email 2.5.4 (Apple Git-61) X-Mailman-Approved-At: Tue, 13 Dec 2016 00:43:45 +0000 Cc: Chris Chiu , linux@endlessm.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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. Signed-off-by: Chris Chiu --- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/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 = { .fifo = gp100_fifo_new, }; +static const struct nvkm_device_chip +nv136_chipset = { + .name = "GP104", + .bar = gf100_bar_new, + .bios = nvkm_bios_new, + .bus = gf100_bus_new, + .devinit = gm200_devinit_new, + .fb = gp104_fb_new, + .fuse = gm107_fuse_new, + .gpio = gk104_gpio_new, + .i2c = gm200_i2c_new, + .ibus = gm200_ibus_new, + .imem = nv50_instmem_new, + .ltc = gp100_ltc_new, + .mc = gp100_mc_new, + .mmu = gf100_mmu_new, + .pci = gp100_pci_new, + .timer = gk20a_timer_new, + .top = gk104_top_new, + .ce[0] = gp104_ce_new, + .ce[1] = gp104_ce_new, + .ce[2] = gp104_ce_new, + .ce[3] = gp104_ce_new, + .disp = gp104_disp_new, + .dma = gf119_dma_new, + .fifo = gp100_fifo_new, +}; + static int nvkm_device_event_ctor(struct nvkm_object *object, void *data, u32 size, struct nvkm_notify *notify) @@ -2644,6 +2672,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func, case 0x12b: device->chip = &nv12b_chipset; break; case 0x130: device->chip = &nv130_chipset; break; case 0x134: device->chip = &nv134_chipset; break; + case 0x136: device->chip = &nv136_chipset; break; default: nvdev_error(device, "unknown chipset (%08x)\n", boot0); goto done;