From patchwork Mon Jun 26 14:33:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sui Jingfeng X-Patchwork-Id: 113001 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7552798vqr; Mon, 26 Jun 2023 08:11:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7oryc7HIO5vz/SUhHGGNA/2jwrTEF3yQkym3Qv89uf0q0pFfVKDjYGfDD50fcDl9cmfLXE X-Received: by 2002:a05:6870:9513:b0:1ad:e92:62e1 with SMTP id u19-20020a056870951300b001ad0e9262e1mr13016551oal.54.1687792277531; Mon, 26 Jun 2023 08:11:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687792277; cv=none; d=google.com; s=arc-20160816; b=mQTNY7q6mQn/92a8jjjX5VsvCez3m7IulJIMWIfwSAmdlZ092O5DF49TljcfAh82Qb ET+xaC9hKPLfGDk3P4cqTbCea+UG1TaUAdDf3RT+W6rOgmA8/0JisW3IBx1EW6G7mv8i cURz8YIZ4VpdulmZpYd+MBh863ro2WycmtSDzt/actO0Ie8r08ZAq8Yja7SSXvVxbLdF RwCmT3XIaKX/WNYtrhB+p5piFwN2e131bbTRWCebVjwZ/K7SJ0DeqbPl+40mhCE9d4yW aMELBbAIwBat+KCOKYhIiwLvZyDUAAh3kFyVE7c1DnOVlzLxBJjtgux1Xmio81nbNYN0 2UpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=HRVfvckNMeCGnwLSwP+O9ncqUcSKD/yM/H0YpWTScnY=; fh=96qtDnTU/URrOT6i7uaKTwabo9K0PbhXvr8DzFjxXtc=; b=TnXugsmwAkK4aBIswsDbvi58BE8C96hMe6TwDr9/TO2OSSFA5ra4xJpg8cLjecplgD uFD6oucB0lD5uR/xsbKMRJCeCbfXYZcSD8w39NTPBAUH2Fm4LuKg4iOZFrpciLD1Rj/N lBNWJY0wLQCrS1dH4dAovufmAsiBRPUENraJybaSGJX+hkD/zDsz5IlSSTQosUwuj45F yVkhS+q/iGO1JY0EQxaC/UzAq1ZUzA4irrSHySgz0oBsBs5U1IXB4Uz+ztEla5Ij9fKv 2bIt85jLFtflVG3nxQma2xhp+oMZoDcQpn1gMc5PTYDDtv0vncUQcKjcJQHIwP8rYXvD +BVQ== ARC-Authentication-Results: i=1; mx.google.com; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r189-20020a632bc6000000b00502f4fd0c16si5648827pgr.653.2023.06.26.08.11.04; Mon, 26 Jun 2023 08:11:17 -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; 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 S230409AbjFZOdj (ORCPT + 99 others); Mon, 26 Jun 2023 10:33:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229783AbjFZOdh (ORCPT ); Mon, 26 Jun 2023 10:33:37 -0400 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 6BF83194; Mon, 26 Jun 2023 07:33:34 -0700 (PDT) Received: from loongson.cn (unknown [10.20.42.43]) by gateway (Coremail) with SMTP id _____8CxqMW8oZlkiW8CAA--.3740S3; Mon, 26 Jun 2023 22:33:32 +0800 (CST) Received: from openarena.loongson.cn (unknown [10.20.42.43]) by localhost.localdomain (Coremail) with SMTP id AQAAf8CxvM67oZlk7cUJAA--.43395S2; Mon, 26 Jun 2023 22:33:31 +0800 (CST) From: Sui Jingfeng To: Thierry Reding , Mikko Perttunen , David Airlie , Daniel Vetter , Jonathan Hunter Cc: dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] drm/tegra: Return an error code if fails Date: Mon, 26 Jun 2023 22:33:30 +0800 Message-Id: <20230626143331.640454-1-suijingfeng@loongson.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: AQAAf8CxvM67oZlk7cUJAA--.43395S2 X-CM-SenderInfo: xvxlyxpqjiv03j6o00pqjv00gofq/ X-Coremail-Antispam: 1Uk129KBj9xXoWrXr17Kr17Kw15Zw4UGF48AFc_yoWxXrgEk3 W0qr47X34IkF4DZF1qvry3Xryayas5uFs7Z3ySy3s3Gw47Zr13XryUuryDur13u3ZxGF98 t3yIqFn8t3Z3GosvyTuYvTs0mTUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUj1kv1TuYvT s0mT0YCTnIWjqI5I8CrVACY4xI64kE6c02F40Ex7xfYxn0WfASr-VFAUDa7-sFnT9fnUUI cSsGvfJTRUUUb28YFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I6I8E6xAIw20EY4v20x vaj40_Wr0E3s1l1IIY67AEw4v_JrI_Jryl8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV WUJVW8JwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6r4UJVWxJr1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqjxCEc2xF0cIa020Ex4CE44I27w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_JrI_JrylYx0Ex4A2jsIE 14v26r4j6F4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07j0sjUUUUUU= X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769778474757352819?= X-GMAIL-MSGID: =?utf-8?q?1769778474757352819?= Return -ENOMEM if tegra_bo_mmap() fails. Signed-off-by: Sui Jingfeng Signed-off-by: Thierry Reding Reviewed-by: Sui Jingfeng --- drivers/gpu/drm/tegra/gem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index dea38892d6e6..0ce22935fbd3 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -710,6 +710,8 @@ static int tegra_gem_prime_vmap(struct dma_buf *buf, struct iosys_map *map) void *vaddr; vaddr = tegra_bo_mmap(&bo->base); + if (!vaddr) + return -ENOMEM; if (IS_ERR(vaddr)) return PTR_ERR(vaddr); From patchwork Mon Jun 26 14:33:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sui Jingfeng X-Patchwork-Id: 112994 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7539115vqr; Mon, 26 Jun 2023 07:52:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6FsWxJauV5N+eHN4UreK8Svnnf7ecRcfuzvbFKcxxHoY5z9i74KgZFDyqoKE/eR2pLGTOZ X-Received: by 2002:a05:6a20:7289:b0:11f:a55f:edf9 with SMTP id o9-20020a056a20728900b0011fa55fedf9mr31127665pzk.39.1687791143156; Mon, 26 Jun 2023 07:52:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687791143; cv=none; d=google.com; s=arc-20160816; b=WjIp+qxwaQvws2fOIW/jBfH30bzvrg8qSPxInKfUOYnOZdQe8Bsugtnk56vXHGeRJX XrWb9YUv0demj4lQRDtfVmgEtIlQQkfGxPuK09fYr6m/seqdcZNPvP+bsWmf6teXj1WB 5aXlr1Lu/JypCX+d3VNnks/yFNzvUJZYHVhGpbCT1kVvgOhc4z/0t+YqwVVHu2R9kimq BiqzsnzPx692uEFAZz8y5SgqFrlzuWNZOI3JwLPDqLSGKXoUvTAch8mOQtetfqeNTOaC 69A/7XxnUc3FVmxJAcRHSPyNLNmRi0T5En9TVmMF7uVP6K28FK6yhn9VzD3/Vx/Vb8mf PtfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=iSTsMgKoNUj2MkNLFj5vQ8HNI3EDBWysQ/B6RjB9JDo=; fh=96qtDnTU/URrOT6i7uaKTwabo9K0PbhXvr8DzFjxXtc=; b=w1LFUBzdGuNY3hk+tHR07I7vDz+naXZRKo/KekmRHlySxHEb0QhpNsrfn5iFg9C8mJ bNtS82jySkgYcENm3Y1A+s3KQivW/AW7td1zZwN4meIvluUiL7CJaEgo3Ea/E7O2JTIe NYOYkVletefKfnotNm5k9stpQdNdBEkvttsVlfNmsvEbRSNZ3zJ76iy0wAWO7Avk4sZh 5nzUU431wI7mmmpE4cG+H0kfc/ZrSGjgUnE1ySaHtKhZN3X+eTCDMlctGk3aXxTHY2Dj CQAzQeWfrJ0GOvqvDZsmaSH/bLg5q+flWN8kfa4TR010GV8qEUnRe7+zn7t1ND5RTKX+ 7IlQ== ARC-Authentication-Results: i=1; mx.google.com; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e5-20020a170902f10500b001ae4e665c60si4720378plb.156.2023.06.26.07.52.08; Mon, 26 Jun 2023 07:52:23 -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; 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 S231172AbjFZOdm (ORCPT + 99 others); Mon, 26 Jun 2023 10:33:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229520AbjFZOdh (ORCPT ); Mon, 26 Jun 2023 10:33:37 -0400 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 145A0E7E; Mon, 26 Jun 2023 07:33:34 -0700 (PDT) Received: from loongson.cn (unknown [10.20.42.43]) by gateway (Coremail) with SMTP id _____8Cx5cS8oZlkjm8CAA--.3784S3; Mon, 26 Jun 2023 22:33:32 +0800 (CST) Received: from openarena.loongson.cn (unknown [10.20.42.43]) by localhost.localdomain (Coremail) with SMTP id AQAAf8CxvM67oZlk7cUJAA--.43395S3; Mon, 26 Jun 2023 22:33:31 +0800 (CST) From: Sui Jingfeng To: Thierry Reding , Mikko Perttunen , David Airlie , Daniel Vetter , Jonathan Hunter Cc: dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] drm/tegra: Remove surplus else after return Date: Mon, 26 Jun 2023 22:33:31 +0800 Message-Id: <20230626143331.640454-2-suijingfeng@loongson.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230626143331.640454-1-suijingfeng@loongson.cn> References: <20230626143331.640454-1-suijingfeng@loongson.cn> MIME-Version: 1.0 X-CM-TRANSID: AQAAf8CxvM67oZlk7cUJAA--.43395S3 X-CM-SenderInfo: xvxlyxpqjiv03j6o00pqjv00gofq/ X-Coremail-Antispam: 1Uk129KBj93XoW7Cw15JF4DAF4fuw1xur1Utwc_yoW8XF13pa yag34YkrZ0qF4DZF12yF4j9wn5ZaySgFyIkFWDJa9avF1DXr10v348tFZrtFy5Gr97JFsI yF4qyw43A347AwcCm3ZEXasCq-sJn29KB7ZKAUJUUUUr529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUU9Fb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r126r13M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_JFI_Gr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2kKe7AKxVWUXVWUAwAS0I0E0xvYzxvE52x082IY62kv0487Mc804VCY07 AIYIkI8VC2zVCFFI0UMc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWU AVWUtwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7V AKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMxCIbckI1I0E14v2 6r1Y6r17MI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17 CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF 0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIx AIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2 KfnxnUUI43ZEXa7IU8l4iUUUUUU== X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769777285656902049?= X-GMAIL-MSGID: =?utf-8?q?1769777285656902049?= else is not generally useful after return Signed-off-by: Sui Jingfeng --- drivers/gpu/drm/tegra/gem.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index 0ce22935fbd3..26d64f4545bd 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -180,15 +180,15 @@ static void *tegra_bo_mmap(struct host1x_bo *bo) struct iosys_map map; int ret; - if (obj->vaddr) { + if (obj->vaddr) return obj->vaddr; - } else if (obj->gem.import_attach) { + + if (obj->gem.import_attach) { ret = dma_buf_vmap_unlocked(obj->gem.import_attach->dmabuf, &map); return ret ? NULL : map.vaddr; - } else { - return vmap(obj->pages, obj->num_pages, VM_MAP, - pgprot_writecombine(PAGE_KERNEL)); } + + return vmap(obj->pages, obj->num_pages, VM_MAP, pgprot_writecombine(PAGE_KERNEL)); } static void tegra_bo_munmap(struct host1x_bo *bo, void *addr) @@ -198,10 +198,11 @@ static void tegra_bo_munmap(struct host1x_bo *bo, void *addr) if (obj->vaddr) return; - else if (obj->gem.import_attach) - dma_buf_vunmap_unlocked(obj->gem.import_attach->dmabuf, &map); - else - vunmap(addr); + + if (obj->gem.import_attach) + return dma_buf_vunmap_unlocked(obj->gem.import_attach->dmabuf, &map); + + vunmap(addr); } static struct host1x_bo *tegra_bo_get(struct host1x_bo *bo)