From patchwork Sat Jul 22 23:47:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 124405 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1045569vqg; Sat, 22 Jul 2023 18:09:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlFB0lr7FggAtPapS3xm2affzZ5T99hHfbAqezsIKBk3KQhj76LkgwynuMeNDudqvMxakIs7 X-Received: by 2002:a9d:6c84:0:b0:6b7:539f:d1b0 with SMTP id c4-20020a9d6c84000000b006b7539fd1b0mr4537002otr.31.1690074581773; Sat, 22 Jul 2023 18:09:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690074581; cv=none; d=google.com; s=arc-20160816; b=vUK8RoMuQhCHJKTKglADgmBoWbACuEtF5n8HwQoAxUknUOUPnj9s+OwphdLPd601UV Evu0us+6lBbE+i4z/3CABb8vv/0eXFk4Y7yAeZTK9uIEnzdQNLdD+Q3XXiaFjqD0l3lC fJNEIrnacNDKr9ebsWCLD7tF1l6mExpOFuqhPE4JG+VKlqnhHQp7TOgZ9pWuzXoORsyn Eq3eKPsC8l272D7itzdVA9mgwWRX8Efov8RHGtAMjnG7iLLVuzA5GZS+rUcj5TLqhRe+ jOM06A+z17onlUTdhSv40/jYILwjfacLaLqop2w1Z3iTH2mgHzeRayoEMbn+8CJ126K7 Dgfw== 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 :dkim-signature; bh=WXjHRdoGpdfbbyAhxBbO7xlY7QUD2+CWRIdPk3Z0eus=; fh=HW3Ufk1vhKIUVKnU/E+oJKAnhVjAsUVyBQ2HXfnwBkM=; b=gHQbDYrKFRQ0pzdMHQVermUanF1g3PiZaf3xctk2BP71nDbAUpit9Eo/F2ffewcAlj kxYy8XHXOLLfBEdrsB402OKW/NZojHP4SxTDmuDpKrRylLZMDCbhrPgrZ2mUU/BRWzeC ZJJ1FtKx3RH8m0Ks81KE+WP6wakbfklVBunYERF9xAQkP+8O3ERbE9PLmiVzwmDIcNZj NMdmcholtk7NtjwnpjCM0kF6LipHAoV5+rFngkbsQeXqG6hRCQpz6WHfcgzKp/TBFc9n +EWijaTCk0E2B1ikk+47icTNuwUAtkQWrHATsX+6++HPrOjPmGJyGau/02e8nc1KqZet sXiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="c/ZQNDgk"; 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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kk5-20020a170903070500b001b3415a07dcsi6003457plb.91.2023.07.22.18.09.20; Sat, 22 Jul 2023 18:09:41 -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=pass header.i=@collabora.com header.s=mail header.b="c/ZQNDgk"; 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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229749AbjGVXxX (ORCPT + 99 others); Sat, 22 Jul 2023 19:53:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229790AbjGVXxN (ORCPT ); Sat, 22 Jul 2023 19:53:13 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64DBC1BDF for ; Sat, 22 Jul 2023 16:53:12 -0700 (PDT) Received: from workpc.. (109-252-150-127.dynamic.spd-mgts.ru [109.252.150.127]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dmitry.osipenko) by madras.collabora.co.uk (Postfix) with ESMTPSA id C31A866070F8; Sun, 23 Jul 2023 00:53:09 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1690069991; bh=yf1OxZ1kcw6ZcPDejn11MXN/PmzY4shoXP9IlAqk44Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c/ZQNDgkm40lUuYWIhCBmVE3vFSyUK3fDWISOSXcz31lOkRCX9qhC/MUamDPrxU0I go+1qUhLFzxhrzlaC81UjL0imtngyyfx9N3fbQ79eYOIik4FG2y9pS03G0/eClg/7c 4hYIsTrPEUi55N3zYvs9Hj5/WgLTzAtUhPzRbkJJgMDRnZcbChJ9tWUsCiZeOYjNjG u9wfeRs3FMZV6KBwG4y+Vo5VpX2UpuzSqnr+9iaHZERNtq1/5lSqpdn8huvOx3NW+K BA67qNWKSJd2MRzssjXngjbXysO152dsRboY+PjG+eo4g6593itgELdh7ceoIEgCbc 7Cvzzk25I/+0g== From: Dmitry Osipenko To: David Airlie , Gerd Hoffmann , Gurchetan Singh , Chia-I Wu , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , =?utf-8?q?Christian_K=C3=B6nig?= , Qiang Yu , Steven Price , Boris Brezillon , Emma Anholt , Melissa Wen Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel@collabora.com, virtualization@lists.linux-foundation.org Subject: [PATCH v14 06/12] drm/shmem-helper: Remove obsoleted is_iomem test Date: Sun, 23 Jul 2023 02:47:40 +0300 Message-ID: <20230722234746.205949-7-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230722234746.205949-1-dmitry.osipenko@collabora.com> References: <20230722234746.205949-1-dmitry.osipenko@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, 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: INBOX X-GMAIL-THRID: 1772171644386885460 X-GMAIL-MSGID: 1772171644386885460 Everything that uses the mapped buffer should by agnostic to is_iomem. The only reason for the is_iomem test is that we're setting shmem->vaddr to the returned map->vaddr. Now that the shmem->vaddr code is gone, remove the obsoleted is_iomem test to clean up the code. Suggested-by: Thomas Zimmermann Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/drm_gem_shmem_helper.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index 0b6c4f318da5..5aa85242071a 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -431,12 +431,6 @@ int drm_gem_shmem_vmap(struct drm_gem_shmem_object *shmem, if (obj->import_attach) { ret = dma_buf_vmap(obj->import_attach->dmabuf, map); - if (!ret) { - if (drm_WARN_ON(obj->dev, map->is_iomem)) { - dma_buf_vunmap(obj->import_attach->dmabuf, map); - return -EIO; - } - } } else { pgprot_t prot = PAGE_KERNEL;