From patchwork Mon Dec 3 19:39:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jordan Crouse X-Patchwork-Id: 10710455 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3572613AF for ; Mon, 3 Dec 2018 19:39:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 294942B30B for ; Mon, 3 Dec 2018 19:39:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1D6BB2B315; Mon, 3 Dec 2018 19:39:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 188D32B30B for ; Mon, 3 Dec 2018 19:39:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725951AbeLCTjv (ORCPT ); Mon, 3 Dec 2018 14:39:51 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:53424 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725891AbeLCTju (ORCPT ); Mon, 3 Dec 2018 14:39:50 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 03EA761484; Mon, 3 Dec 2018 19:39:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1543865990; bh=NfGa2W1Sll/TyZYfe3ZuSbVbo22AGmg2qu00rumNVH8=; h=From:To:Cc:Subject:Date:From; b=oGhpWDW6zSwFj7345KP9b8W0lBuUTEleqDdXvKim3hXrXNEBeuGsD44kxudb9aZGe N+jNZpIwmwYKFQx5JziEJgU14dlLrOJHvQOo/LzTeFgdT16HzpY5sQ3vd+uFcngCwG EFSuyo+vxnJMkhmsXolBsPukloZUioYowMlEvBrY= Received: from jcrouse-lnx.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: jcrouse@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 1BB3461464; Mon, 3 Dec 2018 19:39:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1543865989; bh=NfGa2W1Sll/TyZYfe3ZuSbVbo22AGmg2qu00rumNVH8=; h=From:To:Cc:Subject:Date:From; b=P0ayOqile32FrICRlxekAsmqRzcNJhZd5THxuPQx0b/GsWKq+RAst8ouD5C/K6F7Z QjitI7atc0PycA7jBaU82FJ32xcz5UDnr38oqWTapwpOqL4h5nck93WXg4zpMUguwk ww9s6FFNyJm1KFj4z8xDLBMMIONeu/lgRU5C1Hcs= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 1BB3461464 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=jcrouse@codeaurora.org From: Jordan Crouse To: freedreno@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/msm/a6xx: Use new kernel API free function for gpu state Date: Mon, 3 Dec 2018 12:39:45 -0700 Message-Id: <20181203193945.20282-1-jcrouse@codeaurora.org> X-Mailer: git-send-email 2.18.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP dadb36b7ec42 ("drm/msm: Add a common function to free kernel buffer objects") missed freeing the crashdumper state for a6xx. Signed-off-by: Jordan Crouse --- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c index df6308e7ea67..716595b664dd 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c @@ -149,15 +149,6 @@ static int a6xx_crashdumper_run(struct msm_gpu *gpu, return ret; } -static void a6xx_crashdumper_free(struct msm_gpu *gpu, - struct a6xx_crashdumper *dumper) -{ - msm_gem_unpin_iova(dumper->bo, gpu->aspace); - msm_gem_put_vaddr(dumper->bo); - - drm_gem_object_unreference(dumper->bo); -} - /* read a value from the GX debug bus */ static int debugbus_read(struct msm_gpu *gpu, u32 block, u32 offset, u32 *data) @@ -900,7 +891,7 @@ struct msm_gpu_state *a6xx_gpu_state_get(struct msm_gpu *gpu) a6xx_get_clusters(gpu, a6xx_state, &dumper); a6xx_get_dbgahb_clusters(gpu, a6xx_state, &dumper); - a6xx_crashdumper_free(gpu, &dumper); + msm_gem_kernel_put(dumper.bo, gpu->aspace, true); } a6xx_get_debugbus(gpu, a6xx_state);