From patchwork Thu Jan 11 23:15:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 859401 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mUa8mivX"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zHhYx5TbBz9sNw for ; Fri, 12 Jan 2018 10:15:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753955AbeAKXPc (ORCPT ); Thu, 11 Jan 2018 18:15:32 -0500 Received: from mail-qt0-f193.google.com ([209.85.216.193]:35920 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752634AbeAKXPc (ORCPT ); Thu, 11 Jan 2018 18:15:32 -0500 Received: by mail-qt0-f193.google.com with SMTP id a16so3978486qtj.3 for ; Thu, 11 Jan 2018 15:15:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=x2vTfRD3fllrC9DpkvhOo1wXy3UVj+N8ZYOkRLQmxxQ=; b=mUa8mivXwZCtU5hR2xV/8Ie8e0NxVVRVpe3Zeeb9wxmaSGp5lrQhfkYYeAa2M898PI a3UP5t8LUsdksVC7bGGGmRTwD2L74lSVriYsRtWLgNz6hi676b/PgknIdRH2JZ5WC/pL E/l9fVlBraNb0xKtPnhj2rQHgG8LmLgD1erHvV7brNvRmtODbYFM+05IdTOLwYUd6K0W uWzZM3tNSuDqdHjq3Q5HEc2AOYpHcvvw2ls3Dys2xAPixJLridVSgHVXIFWP87ihkaZo MKruNJDXUEpJzk9aFqg7OkVUD/qBnPpIHWxKiAui2ukR7eUXDzKSELUhs7ArS5C5+Us4 PkdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=x2vTfRD3fllrC9DpkvhOo1wXy3UVj+N8ZYOkRLQmxxQ=; b=oVBWWZnFkmoaIe3+1ZWuMPH7CHw7WLi7pOiOD7uHze2McUILtrkeOJe7SqTwBDfjcr 0FcWB37aXK1njD9rx7OFcl9v1R12TcWrAsi5HNpsXUfzEbSRaJ9xfwAZmmTxVyPoPcGj gV8UhBpYMw6dNR0Z9rMuQ135EdDn089lcR37NzTVR3ZcB/hepwJpmXz3gOJDByiO/kkM /jdADkCYqMjyKyPggHVKCnjTYgdmQRbq/ffB1v6aXmIkcPxgF/NnY64JuJQUgDlJMazp Pl44Xgs1t7UbsAMAoVkxoWNxUX68zKy89mF2tPIToobnJcNeaNHnrMjgKZ8Szh6iJ8sP XaIQ== X-Gm-Message-State: AKwxytcPFykChWcYtLAyXlU0zCd59Qh2ywSOm7nPl27Nw58HLSf/mUCK yWP/TXNCQ7SNE0sy8R4jiDIG0w== X-Google-Smtp-Source: ACJfBov8b5ZyuBj7nU5zyQq2V/bTv+eYwv+Og5tqwV4U/A1OvmP5Ov4wP9fDsGC23EHFV98DjanyLg== X-Received: by 10.200.58.228 with SMTP id x91mr34259021qte.323.1515712531498; Thu, 11 Jan 2018 15:15:31 -0800 (PST) Received: from localhost (p200300E41F21CF00227DB10B7BBDB590.dip0.t-ipconnect.de. [2003:e4:1f21:cf00:227d:b10b:7bbd:b590]) by smtp.gmail.com with ESMTPSA id c12sm1690812qka.17.2018.01.11.15.15.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Jan 2018 15:15:30 -0800 (PST) From: Thierry Reding To: Ben Skeggs Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-tegra@vger.kernel.org Subject: [PATCH] drm/nouveau: Pass the proper arguments to nvif_object_map_handle() Date: Fri, 12 Jan 2018 00:15:28 +0100 Message-Id: <20180111231528.6768-1-thierry.reding@gmail.com> X-Mailer: git-send-email 2.15.1 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Thierry Reding This is obviously wrong in the current code. Make sure to record the correct size of the arguments and pass the actual arguments to the nvif_object_map_handle() function. Suggested-by: Ben Skeggs Signed-off-by: Thierry Reding --- drivers/gpu/drm/nouveau/nouveau_bo.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index a8a957207f3a..8334b3f4e60b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -1494,11 +1494,13 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg) args.nv50.ro = 0; args.nv50.kind = mem->kind; args.nv50.comp = mem->comp; + argc = sizeof(args.nv50); break; case NVIF_CLASS_MEM_GF100: args.gf100.version = 0; args.gf100.ro = 0; args.gf100.kind = mem->kind; + argc = sizeof(args.gf100); break; default: WARN_ON(1); @@ -1506,7 +1508,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg) } ret = nvif_object_map_handle(&mem->mem.object, - &argc, argc, + &args, argc, &handle, &length); if (ret != 1) { pr_info(" nvif_object_map_handle(): %d\n", ret);