Received: by 2002:a05:6358:7058:b0:131:369:b2a3 with SMTP id 24csp2022200rwp; Thu, 13 Jul 2023 22:31:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlHjNfUOwXRSu6kLSJpF0H0bWKpQvqVCOU/8o8dWj0+3/HcGs562VxS86+8nwIb18Hp9cSX6 X-Received: by 2002:a05:6512:3f0b:b0:4f9:6a74:d149 with SMTP id y11-20020a0565123f0b00b004f96a74d149mr2937984lfa.15.1689312695894; Thu, 13 Jul 2023 22:31:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689312695; cv=none; d=google.com; s=arc-20160816; b=GXZEWBE85LU9e7vvIU2Nj8TDOl2mKtnfWyRLIPywlRzanoGPTX9GoEoR4iCTqMN6HS a78M91SkTvBs2DH4UokOAVaua6ShxPtETLZjLUqYtxJUQ4l5vjUHwA+gZ8F5qvqxEUWA B6PeecH9sJY1OVubEjISD3yOHtKqA22guv7lTyDmg/NKcxnjjVz/SNxPRDDSX6es3VYa y7Snmpogdf3GvPur9KfXZIs6y2QOgqvUs4vInN53s1dMP6dct3wkKETfkA9gOuEIVadS lN8iM4arZ9UHCfc9vpgak32xULAVwySmvjHcNMaGaYKg3LKHoFJK8XGDgxJ92UO0X1ct 3JFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:message-id:user-agent :references:in-reply-to:subject:cc:to:from:date:mime-version :dkim-signature; bh=GEZDM1fTzW0Az08VNBzVQoNDQefOwQOfb0L0r5AhC9U=; fh=DRX5GVTbvUIg0dfeOR3Un4dckFuVfp8mh5WQfMORIg0=; b=J2UYFTJnmj2xDSD+j7jRFSWohKtz59ZNIajWHMbLOA4bKdaxisq8hvYNAX9qvmzWsb Yl0SoqNEF+BhjZ7pflOPdt9Z58K7kM9nm29zidn2NLHmgIEXs/rLz6np0AnX7iU9tAB6 KZ9YXvTr6in970sb2x22Rmdk5VTOxZwZg3O45YrVGJWxUBWsdTe8KAMsDe9Q49CC1HOI g+8IR3hJmkRCUQyK+1PnkRetOHGfTzqV7J9YlyMs8PfYKiBWMGqGPXZXop4dekkp9lyQ Zo4/3jjtATUfpiSBX4SxvoAQOkH6Rqh3UWpqB//goRVjvxDszMA+1HM7qrMgco5xIxbS OHnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (bad version) header.i=@208.org header.s=dkim header.b=ClYf8Qwi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d12-20020aa7c1cc000000b0051bfc04e1b4si8216219edp.226.2023.07.13.22.31.12; Thu, 13 Jul 2023 22:31:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=neutral (bad version) header.i=@208.org header.s=dkim header.b=ClYf8Qwi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234417AbjGNFOr (ORCPT + 99 others); Fri, 14 Jul 2023 01:14:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233916AbjGNFOj (ORCPT ); Fri, 14 Jul 2023 01:14:39 -0400 Received: from mail.208.org (unknown [183.242.55.162]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C9CF173B for ; Thu, 13 Jul 2023 22:14:38 -0700 (PDT) Received: from mail.208.org (email.208.org [127.0.0.1]) by mail.208.org (Postfix) with ESMTP id 4R2KQz1MtFzBR9sg for ; Fri, 14 Jul 2023 13:14:35 +0800 (CST) Authentication-Results: mail.208.org (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=208.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=208.org; h= content-transfer-encoding:content-type:message-id:user-agent :references:in-reply-to:subject:to:from:date:mime-version; s= dkim; t=1689311675; x=1691903676; bh=7scmTbQs/wsjbW5FBE+Ka8Is++h 9WlnkMEr/CtGidh8=; b=ClYf8QwinKCS8+rWu4p8AlUX6Uw66TZaMBC4DO3nQ/D Ir5rLqZ84oKpxtty9DCXDzrB2ysb1DLN/PJvBOVWVUyy5Ym5jugK3/wZZgkUIqMg kkKtZ+NVd8tsxieT3q33yuU4BR45fX7mrjg/Ti27dCSYz17fBXkP0Ucvt1rJ4+lQ HKTw2R4jraaVCa5Y0SgREwOvSa1NKcAud+C7QqHPJeyYQtwvDjng2cAmohpB4I8W wDyg6RCezoMwbhLSCt3uHahlRZyjUf5upbx/2BcxPl/7iNKzkslojHdEdbBo0J+w qI/xrFsHe7re+vDWewMciOwLoPnvjoKVtCAj4KQfpzw== X-Virus-Scanned: amavisd-new at mail.208.org Received: from mail.208.org ([127.0.0.1]) by mail.208.org (mail.208.org [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id E5CfpniD8zc5 for ; Fri, 14 Jul 2023 13:14:35 +0800 (CST) Received: from localhost (email.208.org [127.0.0.1]) by mail.208.org (Postfix) with ESMTPSA id 4R2KQy2hgTzBHXhS; Fri, 14 Jul 2023 13:14:34 +0800 (CST) MIME-Version: 1.0 Date: Fri, 14 Jul 2023 13:14:34 +0800 From: huzhi001@208suo.com To: bskeggs@redhat.com, kherbst@redhat.com, lyude@redhat.com, airlied@gmail.com, daniel@ffwll.ch Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/nouveau/fifo:Fix Nineteen occurrences of the gk104.c error: ERROR: space prohibited before that ':' (ctx:WxW) ERROR: trailing statements should be on next line ERROR: space prohibited before that ':' (ctx:WxW) ERROR: trailing statements should be on next line ERROR: space prohibited before that ':' (ctx:WxW) ERROR: trailing statements should be on next line ERROR: trailing statements should be on next line ERROR: space prohibited before that ':' (ctx:WxW) ERROR: trailing statements should be on next line ERROR: space prohibited before that ':' (ctx:WxW) ERROR: trailing statements should be on next line ERROR: space prohibited before that ':' (ctx:WxW) ERROR: trailing statements should be on next line ERROR: space prohibited before that ':' (ctx:WxW) ERROR: trailing statements should be on next line ERROR: space prohibited before that ':' (ctx:WxE) ERROR: space prohibited before that ':' (ctx:WxE) ERROR: trailing statements should be on next line ERROR: trailing s tatements should be on next line In-Reply-To: References: User-Agent: Roundcube Webmail Message-ID: X-Sender: huzhi001@208suo.com Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,RCVD_IN_DNSWL_BLOCKED,RDNS_NONE,SPF_HELO_FAIL,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: ZhiHu --- .../gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 40 ++++++++++++++----- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c index d8a4d773a58c..b99e0a7c96bb 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c @@ -137,15 +137,29 @@ gk104_ectx_bind(struct nvkm_engn *engn, struct nvkm_cctx *cctx, struct nvkm_chan u64 addr = 0ULL; switch (engn->engine->subdev.type) { - case NVKM_ENGINE_SW : return; - case NVKM_ENGINE_GR : ptr0 = 0x0210; break; - case NVKM_ENGINE_SEC : ptr0 = 0x0220; break; - case NVKM_ENGINE_MSPDEC: ptr0 = 0x0250; break; - case NVKM_ENGINE_MSPPP : ptr0 = 0x0260; break; - case NVKM_ENGINE_MSVLD : ptr0 = 0x0270; break; - case NVKM_ENGINE_VIC : ptr0 = 0x0280; break; - case NVKM_ENGINE_MSENC : ptr0 = 0x0290; break; - case NVKM_ENGINE_NVDEC : + case NVKM_ENGINE_SW: + return; + case NVKM_ENGINE_GR: + ptr0 = 0x0210; + break; + case NVKM_ENGINE_SEC: + ptr0 = 0x0220; + break; + case NVKM_ENGINE_MSPDEC: + ptr0 = 0x0250; + break; + case NVKM_ENGINE_MSPPP: + ptr0 = 0x0260; + break; + case NVKM_ENGINE_MSVLD: + ptr0 = 0x0270; + break; + case NVKM_ENGINE_VIC: + ptr0 = 0x0280; break; + case NVKM_ENGINE_MSENC: + ptr0 = 0x0290; + break; + case NVKM_ENGINE_NVDEC: ptr1 = 0x0270; ptr0 = 0x0210; break; @@ -435,8 +449,12 @@ gk104_runl_commit(struct nvkm_runl *runl, struct nvkm_memory *memory, u32 start, int target; switch (nvkm_memory_target(memory)) { - case NVKM_MEM_TARGET_VRAM: target = 0; break; - case NVKM_MEM_TARGET_NCOH: target = 3; break; + case NVKM_MEM_TARGET_VRAM: + target = 0; + break; + case NVKM_MEM_TARGET_NCOH: + target = 3; + break; default: WARN_ON(1); return;