From nobody Wed Apr 8 06:10:13 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7EDFFC28D13 for ; Tue, 23 Aug 2022 00:03:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238879AbiHWADj (ORCPT ); Mon, 22 Aug 2022 20:03:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238567AbiHWADf (ORCPT ); Mon, 22 Aug 2022 20:03:35 -0400 Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 957E113F50 for ; Mon, 22 Aug 2022 17:03:33 -0700 (PDT) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 27N03RMd086994; Mon, 22 Aug 2022 19:03:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1661213007; bh=+4YlvD2lm4oR+5jkPdSahNrSh4ZAMtVQt61EY5evfbs=; h=From:To:CC:Subject:Date; b=ryvIwCrxVz7g0Iledoq8NVn/xhBYJf7P2cC2Th7ZkzJHftUWH0WXM5+NH18goVFLy cjD2vKZd7LyUefX0F7SI5CmRJ44Qthm6fKmgN0WOGvp7uQQWNXajepRkjLMg0FAUtz aVH9KaZirWeSC2MT7aXnR5Eqjel8Ha3SG+YTRW7o= Received: from DLEE114.ent.ti.com (dlee114.ent.ti.com [157.170.170.25]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 27N03RpI031614 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 22 Aug 2022 19:03:27 -0500 Received: from DLEE115.ent.ti.com (157.170.170.26) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.6; Mon, 22 Aug 2022 19:03:27 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DLEE115.ent.ti.com (157.170.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.6 via Frontend Transport; Mon, 22 Aug 2022 19:03:27 -0500 Received: from ula0226330.dal.design.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 27N03QJI093455; Mon, 22 Aug 2022 19:03:26 -0500 From: Andrew Davis To: David Airlie , Daniel Vetter , Tomi Valkeinen , , CC: Andrew Davis Subject: [PATCH] drm: omapdrm: Improve check for contiguous buffers Date: Mon, 22 Aug 2022 19:03:26 -0500 Message-ID: <20220823000326.10056-1-afd@ti.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" While a scatter-gather table having only 1 entry does imply it is contiguous, it is a logic error to assume the inverse. Tables can have more than 1 entry and still be contiguous. Use a proper check here. Signed-off-by: Andrew Davis Reported-by: kernel test robot --- drivers/gpu/drm/omapdrm/omap_gem.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/o= map_gem.c index cf571796fd26..52c00b795459 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -48,7 +48,7 @@ struct omap_gem_object { * OMAP_BO_MEM_DMA_API flag set) * * - buffers imported from dmabuf (with the OMAP_BO_MEM_DMABUF flag set) - * if they are physically contiguous (when sgt->orig_nents =3D=3D 1) + * if they are physically contiguous * * - buffers mapped through the TILER when pin_cnt is not zero, in which * case the DMA address points to the TILER aperture @@ -148,12 +148,18 @@ u64 omap_gem_mmap_offset(struct drm_gem_object *obj) return drm_vma_node_offset_addr(&obj->vma_node); } =20 +static bool omap_gem_sgt_is_contiguous(struct sg_table *sgt, size) +{ + return !(drm_prime_get_contiguous_size(sgt) < size); +} + static bool omap_gem_is_contiguous(struct omap_gem_object *omap_obj) { if (omap_obj->flags & OMAP_BO_MEM_DMA_API) return true; =20 - if ((omap_obj->flags & OMAP_BO_MEM_DMABUF) && omap_obj->sgt->nents =3D=3D= 1) + if ((omap_obj->flags & OMAP_BO_MEM_DMABUF) && + omap_gem_sgt_is_contiguous(omap_obj->sgt, omap_obj->base->size)) return true; =20 return false; @@ -1398,7 +1404,7 @@ struct drm_gem_object *omap_gem_new_dmabuf(struct drm= _device *dev, size_t size, union omap_gem_size gsize; =20 /* Without a DMM only physically contiguous buffers can be supported. */ - if (sgt->orig_nents !=3D 1 && !priv->has_dmm) + if (!omap_gem_sgt_is_contiguous(sgt, size) && !priv->has_dmm) return ERR_PTR(-EINVAL); =20 gsize.bytes =3D PAGE_ALIGN(size); @@ -1412,7 +1418,7 @@ struct drm_gem_object *omap_gem_new_dmabuf(struct drm= _device *dev, size_t size, =20 omap_obj->sgt =3D sgt; =20 - if (sgt->orig_nents =3D=3D 1) { + if (omap_gem_sgt_is_contiguous(sgt, size)) { omap_obj->dma_addr =3D sg_dma_address(sgt->sgl); } else { /* Create pages list from sgt */ --=20 2.36.1