From patchwork Tue Apr 13 13:52:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 12200579 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6AEB5C433ED for ; Tue, 13 Apr 2021 13:52:55 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2CDDE61206 for ; Tue, 13 Apr 2021 13:52:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2CDDE61206 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4E25589DD5; Tue, 13 Apr 2021 13:52:53 +0000 (UTC) Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by gabe.freedesktop.org (Postfix) with ESMTPS id E136489CA8 for ; Tue, 13 Apr 2021 13:52:51 +0000 (UTC) Received: by mail-ed1-x52e.google.com with SMTP id 18so19516324edx.3 for ; Tue, 13 Apr 2021 06:52:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FVL0BgBsuCyt6x71yV2SuUPVTs3tOkFSsKQTRfH0RRY=; b=BekQEhlXUObKDvsRlauX6WCOaCRjtZApv5mNsu6OWJt8t0FGXb+vhP3DFI0bah+p60 vjfSC7yVVOVBzrYnvxnnRjn6BxfZkWB0/TOtvmRRCRoiP6JvLnxAS8bfCUrxw53HoYk5 2uvHvCSMFMzRtAWZbda9SVXjclpD8NgRsm0Nnfn8NqpkkPuGmpQRX9/26FFPaDaXFiR1 tIzjrFq4AkMcFbqrGj+jHK2+o4TWJ4wdHcrlM50ADS6/+D+nQ0G7B9LBrWZFnPo4tk49 2QkWKcJ9FCfBaGZH5BqfbVkj0v3GHPg5CeNt9RkXMkOuSd49exErWQKIFO94DF77VD2b 1H4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FVL0BgBsuCyt6x71yV2SuUPVTs3tOkFSsKQTRfH0RRY=; b=GEi+qCfPb88AiluT9x1glsPL3U9LAc4fJwU5JYvo6doy0PSl+eV9xpmSkQCXtVXBQT BkNql62hZm/qORGaJ4eI0XLIU31vEW5Nb79/6zqZCRAPrGF8d7QUYu5t593yYva5B2bO it483jqhbWgAPNQG8EWOYRN5OQOfKTWfXJ5lfxcbTwyJy3CifMdYuH3JcVvry64G/+W9 sy1xTAPFJibcI5PX+sjqliXOidp9OZ6dAXmo6C3kocftZR6Dp+AOnOKQRMsNV9rcUF0q PmyZN9wFkM8tw09lq+Xu2sc/uoSbWSQheWjylM428WJHOZEBx/gj6ZSjLlWVgl0p9a0d 0Qkg== X-Gm-Message-State: AOAM533JUSCpjNc80jCtjhlxTR/HFNo7dD6IXi2MW6mZeB2dEY2XQV4N QEByLl78dKsuSqrwRkLEB28H8gMnuec= X-Google-Smtp-Source: ABdhPJzpe8MjVnmnKuRwbgpvJoEP+Rl3O1P62Pf99V7ou4E7KV0+GOncPwlf7NxQN6vMr1YAXeIAeQ== X-Received: by 2002:aa7:c654:: with SMTP id z20mr35410842edr.159.1618321970650; Tue, 13 Apr 2021 06:52:50 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:a061:9101:8418:4794]) by smtp.gmail.com with ESMTPSA id m10sm491465ejc.32.2021.04.13.06.52.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Apr 2021 06:52:50 -0700 (PDT) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/7] drm/amdgpu: check base size instead of mem.num_pages Date: Tue, 13 Apr 2021 15:52:43 +0200 Message-Id: <20210413135248.1266-2-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210413135248.1266-1-christian.koenig@amd.com> References: <20210413135248.1266-1-christian.koenig@amd.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: daniel.vetter@ffwll.ch, thomas.hellstrom@linux.intel.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Drop some ussage of mem in the code. Signed-off-by: Christian König Reviewed-by: Matthew Auld --- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 984dcf5a475e..e316cebb1fdc 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -1327,7 +1327,7 @@ vm_fault_t amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo) struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev); struct ttm_operation_ctx ctx = { false, false }; struct amdgpu_bo *abo = ttm_to_amdgpu_bo(bo); - unsigned long offset, size; + unsigned long offset; int r; /* Remember that this BO was accessed by the CPU */ @@ -1336,9 +1336,8 @@ vm_fault_t amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo) if (bo->mem.mem_type != TTM_PL_VRAM) return 0; - size = bo->mem.num_pages << PAGE_SHIFT; offset = bo->mem.start << PAGE_SHIFT; - if ((offset + size) <= adev->gmc.visible_vram_size) + if ((offset + bo->base.size) <= adev->gmc.visible_vram_size) return 0; /* Can't move a pinned BO to visible VRAM */ @@ -1363,7 +1362,7 @@ vm_fault_t amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo) offset = bo->mem.start << PAGE_SHIFT; /* this should never happen */ if (bo->mem.mem_type == TTM_PL_VRAM && - (offset + size) > adev->gmc.visible_vram_size) + (offset + bo->base.size) > adev->gmc.visible_vram_size) return VM_FAULT_SIGBUS; ttm_bo_move_to_lru_tail_unlocked(bo);