From patchwork Mon Jan 22 18:10:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jordan Crouse X-Patchwork-Id: 10179015 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6D375601D5 for ; Mon, 22 Jan 2018 18:11:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6401028462 for ; Mon, 22 Jan 2018 18:11:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5880D28468; Mon, 22 Jan 2018 18:11:02 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F402C28462 for ; Mon, 22 Jan 2018 18:11:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B1B226E292; Mon, 22 Jan 2018 18:10:58 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from smtp.codeaurora.org (smtp.codeaurora.org [198.145.29.96]) by gabe.freedesktop.org (Postfix) with ESMTPS id CB5736E288; Mon, 22 Jan 2018 18:10:52 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1000) id B5D666090E; Mon, 22 Jan 2018 18:10:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1516644652; bh=eIWPFOv5x2LA3kmTuarWxQGF5oBZPZsTfxohu4r7gkI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MQnZmzTmajjuahrOYcWb9/4IcUh4LiValnv3frY2afrBAZy84kkYJPlVGxH36/Ehg D0nzSXbuZODYfhikVyWU+aleOyeyldxd/cHE21g/8j4y32qs7nynb2GQPnkEc/frGm PggaHaHxxPNhGFZq2G31BRlo0TBe/8W/mwxJBKXo= 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 E620260807; Mon, 22 Jan 2018 18:10:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1516644652; bh=eIWPFOv5x2LA3kmTuarWxQGF5oBZPZsTfxohu4r7gkI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MQnZmzTmajjuahrOYcWb9/4IcUh4LiValnv3frY2afrBAZy84kkYJPlVGxH36/Ehg D0nzSXbuZODYfhikVyWU+aleOyeyldxd/cHE21g/8j4y32qs7nynb2GQPnkEc/frGm PggaHaHxxPNhGFZq2G31BRlo0TBe/8W/mwxJBKXo= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org E620260807 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, dri-devel@lists.freedesktop.org Subject: [PATCH 2/5] drm/msm/adreno: Use generic function to load firwmare to a buffer object Date: Mon, 22 Jan 2018 11:10:44 -0700 Message-Id: <1516644647-7507-3-git-send-email-jcrouse@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1516644647-7507-1-git-send-email-jcrouse@codeaurora.org> References: <1516644647-7507-1-git-send-email-jcrouse@codeaurora.org> Cc: linux-arm-msm@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Move a5xx specific code to load firmware into a buffer object to the generic Adreno code. This will come in useful for future targets. Signed-off-by: Jordan Crouse --- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 32 ++------------------------------ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 29 +++++++++++++++++++++++++++++ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 2 ++ 3 files changed, 33 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c index e8e726e..0e3943c 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c @@ -433,34 +433,6 @@ static int a5xx_preempt_start(struct msm_gpu *gpu) } -static struct drm_gem_object *a5xx_ucode_load_bo(struct msm_gpu *gpu, - const char *fwname, u64 *iova) -{ - struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu); - const struct firmware *fw; - struct drm_gem_object *bo; - void *ptr; - - fw = adreno_request_fw(adreno_gpu, fwname); - if (IS_ERR(fw)) - return ERR_CAST(fw); - - ptr = msm_gem_kernel_new_locked(gpu->dev, fw->size - 4, - MSM_BO_UNCACHED | MSM_BO_GPU_READONLY, gpu->aspace, &bo, iova); - - if (IS_ERR(ptr)) { - bo = ERR_CAST(ptr); - goto out; - } - - memcpy(ptr, &fw->data[4], fw->size - 4); - - msm_gem_put_vaddr(bo); -out: - release_firmware(fw); - return bo; -} - static int a5xx_ucode_init(struct msm_gpu *gpu) { struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu); @@ -468,7 +440,7 @@ static int a5xx_ucode_init(struct msm_gpu *gpu) int ret; if (!a5xx_gpu->pm4_bo) { - a5xx_gpu->pm4_bo = a5xx_ucode_load_bo(gpu, + a5xx_gpu->pm4_bo = adreno_request_fw_bo(gpu, adreno_gpu->info->pm4fw, &a5xx_gpu->pm4_iova); if (IS_ERR(a5xx_gpu->pm4_bo)) { @@ -481,7 +453,7 @@ static int a5xx_ucode_init(struct msm_gpu *gpu) } if (!a5xx_gpu->pfp_bo) { - a5xx_gpu->pfp_bo = a5xx_ucode_load_bo(gpu, + a5xx_gpu->pfp_bo = adreno_request_fw_bo(gpu, adreno_gpu->info->pfpfw, &a5xx_gpu->pfp_iova); if (IS_ERR(a5xx_gpu->pfp_bo)) { diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 9253550..fc180ad 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -138,6 +138,35 @@ int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value) return ERR_PTR(-ENOENT); } +struct drm_gem_object *adreno_request_fw_bo(struct msm_gpu *gpu, + const char *fwname, u64 *iova) +{ + struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu); + const struct firmware *fw; + struct drm_gem_object *bo; + void *ptr; + + fw = adreno_request_fw(adreno_gpu, fwname); + if (IS_ERR(fw)) + return ERR_CAST(fw); + + ptr = msm_gem_kernel_new_locked(gpu->dev, fw->size - 4, + MSM_BO_UNCACHED | MSM_BO_GPU_READONLY, gpu->aspace, &bo, iova); + + if (IS_ERR(ptr)) { + bo = ERR_CAST(ptr); + goto out; + } + + memcpy(ptr, &fw->data[4], fw->size - 4); + + msm_gem_put_vaddr(bo); +out: + release_firmware(fw); + return bo; +} + + int adreno_hw_init(struct msm_gpu *gpu) { struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu); diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h index bfdaaf2..e799dd6 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h @@ -197,6 +197,8 @@ static inline int adreno_is_a530(struct adreno_gpu *gpu) int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value); const struct firmware *adreno_request_fw(struct adreno_gpu *adreno_gpu, const char *fwname); +struct drm_gem_object *adreno_request_fw_bo(struct msm_gpu *gpu, + const char *fwname, u64 *iova); int adreno_hw_init(struct msm_gpu *gpu); void adreno_recover(struct msm_gpu *gpu); void adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,