From patchwork Sun Mar 19 01:53:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilia Mirkin X-Patchwork-Id: 9632429 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 688B7601E9 for ; Sun, 19 Mar 2017 01:53:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56FF5282E2 for ; Sun, 19 Mar 2017 01:53:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 488E328339; Sun, 19 Mar 2017 01:53:22 +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 F1687282E2 for ; Sun, 19 Mar 2017 01:53:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E91536E3B4; Sun, 19 Mar 2017 01:53:18 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-x241.google.com (mail-qk0-x241.google.com [IPv6:2607:f8b0:400d:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id B9F166E3B4; Sun, 19 Mar 2017 01:53:17 +0000 (UTC) Received: by mail-qk0-x241.google.com with SMTP id o135so14205511qke.2; Sat, 18 Mar 2017 18:53:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=NOJHihqc/Iq23FkeWbXy7JOn6+/HxLyh8Q9tGNATZs8=; b=sUB6uxjNyWWQrAXr8FCqttt97lvyfKjsnD2028sskfPST4jrPsHIXdWQd95Muwswe0 aipwWGrfU8yIiEsHn1D3PN7v4Z1KkXHcVZ6mK72hNfEKC6rnhS8zh40rVRZGmIy2wudH SpehoJ59ZRsWjh1Z1KgxNlVYoVhgTXlTWwm83OU3EJK/tb2x980ehCdWJwWT1+ply9Ec DpPhAXKGGRHyzOUQBjzao8yxcM9bbNlK5WgCMHxX1TzXw36626BAIEm6DlLBGykN9Hwd 5BFj46MZY4+yz3p9cys8nfRhQQGzd2rSfLmbQe9BuIJpR7Ewaluinz7ECqcI2E46lNR+ S7Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=NOJHihqc/Iq23FkeWbXy7JOn6+/HxLyh8Q9tGNATZs8=; b=TyB2bgPCIHAUSMHdCXFNy6DY1JUv3/VoJtxHYwNNAkQxN9GwykXW2aNJ6jApe3HmHZ msV7nlbFhYvnQ5U01HpRpdfXdKddCbu4fgdEvG12OtqHqy7FfxePqDBXtaGf3fUC+yrv z2WFMTSbXE0gSPGepDRyetlOcqloK4Y0SYdMPYZCc8GjDPyRzBIVYEZrinYBZvCWAAU1 38NAlVdz2/BIvNjKH0AgbZAkkq+H8HYJtYXWvsOj+lUYIVPbfNFb6yURdWptGhO76dFz ToCuO54vAFjMkQGFVUb1VfuPGH9InkrIcCPhr02MLrXQIX84tSO4u2j9S5FN7Nvs57w6 7JFQ== X-Gm-Message-State: AFeK/H19ekVi9L/Sj3LFDMlQavz+SdY4laz51rLZm6WLKdOxmKp2hNzLLyEAJE6IxWbXag== X-Received: by 10.55.186.134 with SMTP id k128mr11480649qkf.40.1489888396795; Sat, 18 Mar 2017 18:53:16 -0700 (PDT) Received: from localhost.localdomain ([2604:2000:e348:9900:9e14:65ff:feb9:8394]) by smtp.gmail.com with ESMTPSA id t67sm9302089qkd.41.2017.03.18.18.53.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 18 Mar 2017 18:53:15 -0700 (PDT) From: Ilia Mirkin To: Ben Skeggs , Dave Airlie Subject: [PATCH] drm/nouveau/mpeg: mthd returns true on success now Date: Sat, 18 Mar 2017 21:53:05 -0400 Message-Id: <20170319015305.6390-1-imirkin@alum.mit.edu> X-Mailer: git-send-email 2.10.2 Cc: nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org 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 Signed-off-by: Ilia Mirkin Fixes: 590801c1a3 ("drm/nouveau/mpeg: remove dependence on namedb/engctx lookup") Cc: stable@vger.kernel.org # v4.3+ --- This is just a nice-to-have, as it only affects an error print afterwards. drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c index 003ac91..8a88952 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c @@ -198,7 +198,7 @@ nv31_mpeg_intr(struct nvkm_engine *engine) } if (type == 0x00000010) { - if (!nv31_mpeg_mthd(mpeg, mthd, data)) + if (nv31_mpeg_mthd(mpeg, mthd, data)) show &= ~0x01000000; } } diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c index e536f37..c3cf02e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c @@ -172,7 +172,7 @@ nv44_mpeg_intr(struct nvkm_engine *engine) } if (type == 0x00000010) { - if (!nv44_mpeg_mthd(subdev->device, mthd, data)) + if (nv44_mpeg_mthd(subdev->device, mthd, data)) show &= ~0x01000000; } }