devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Neil Armstrong <neil.armstrong@linaro.org>
To: Connor Abbott <cwabbott0@gmail.com>,
	Bjorn Andersson <andersson@kernel.org>,
	Konrad Dybcio <konrad.dybcio@linaro.org>,
	Rob Herring <robh@kernel.org>,
	Krzysztof Kozlowski <krzk+dt@kernel.org>,
	Conor Dooley <conor+dt@kernel.org>, Jun Nie <jun.nie@linaro.org>,
	Rob Clark <robdclark@gmail.com>,
	Abhinav Kumar <quic_abhinavk@quicinc.com>,
	Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
	Sean Paul <sean@poorly.run>,
	Marijn Suijten <marijn.suijten@somainline.org>
Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
	freedreno@lists.freedesktop.org
Subject: Re: [PATCH v3 4/6] drm/msm/a7xx: Initialize a750 "software fuse"
Date: Wed, 26 Jun 2024 11:33:30 +0200	[thread overview]
Message-ID: <041cbf33-9fce-4f72-be90-23bc7d215b10@linaro.org> (raw)
In-Reply-To: <20240430-a750-raytracing-v3-4-7f57c5ac082d@gmail.com>

Hi,

On 30/04/2024 12:43, Connor Abbott wrote:
> On all Qualcomm platforms with a7xx GPUs, qcom_scm provides a method to
> initialize cx_mem. Copy this from downstream (minus BCL which we
> currently don't support). On a750, this includes a new "fuse" register
> which can be used by qcom_scm to fuse off certain features like
> raytracing in software. The fuse is default off, and is initialized by
> calling the method. Afterwards we have to read it to find out which
> features were enabled.
> 
> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> Signed-off-by: Connor Abbott <cwabbott0@gmail.com>
> ---
>   drivers/gpu/drm/msm/adreno/a6xx_gpu.c   | 91 ++++++++++++++++++++++++++++++++-
>   drivers/gpu/drm/msm/adreno/adreno_gpu.h |  2 +
>   2 files changed, 92 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> index cf0b1de1c071..52b080206090 100644
> --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> @@ -10,6 +10,7 @@
>   
>   #include <linux/bitfield.h>
>   #include <linux/devfreq.h>
> +#include <linux/firmware/qcom/qcom_scm.h>
>   #include <linux/pm_domain.h>
>   #include <linux/soc/qcom/llcc-qcom.h>
>   
> @@ -1686,7 +1687,8 @@ static int a6xx_zap_shader_init(struct msm_gpu *gpu)
>   		       A6XX_RBBM_INT_0_MASK_RBBM_HANG_DETECT | \
>   		       A6XX_RBBM_INT_0_MASK_UCHE_OOB_ACCESS | \
>   		       A6XX_RBBM_INT_0_MASK_UCHE_TRAP_INTR | \
> -		       A6XX_RBBM_INT_0_MASK_TSBWRITEERROR)
> +		       A6XX_RBBM_INT_0_MASK_TSBWRITEERROR | \
> +		       A6XX_RBBM_INT_0_MASK_SWFUSEVIOLATION)
>   
>   #define A7XX_APRIV_MASK (A6XX_CP_APRIV_CNTL_ICACHE | \
>   			 A6XX_CP_APRIV_CNTL_RBFETCH | \
> @@ -2356,6 +2358,27 @@ static void a6xx_fault_detect_irq(struct msm_gpu *gpu)
>   	kthread_queue_work(gpu->worker, &gpu->recover_work);
>   }
>   
> +static void a7xx_sw_fuse_violation_irq(struct msm_gpu *gpu)
> +{
> +	u32 status;
> +
> +	status = gpu_read(gpu, REG_A7XX_RBBM_SW_FUSE_INT_STATUS);
> +	gpu_write(gpu, REG_A7XX_RBBM_SW_FUSE_INT_MASK, 0);
> +
> +	dev_err_ratelimited(&gpu->pdev->dev, "SW fuse violation status=%8.8x\n", status);
> +
> +	/*
> +	 * Ignore FASTBLEND violations, because the HW will silently fall back
> +	 * to legacy blending.
> +	 */
> +	if (status & (A7XX_CX_MISC_SW_FUSE_VALUE_RAYTRACING |
> +		      A7XX_CX_MISC_SW_FUSE_VALUE_LPAC)) {
> +		del_timer(&gpu->hangcheck_timer);
> +
> +		kthread_queue_work(gpu->worker, &gpu->recover_work);
> +	}
> +}
> +
>   static irqreturn_t a6xx_irq(struct msm_gpu *gpu)
>   {
>   	struct msm_drm_private *priv = gpu->dev->dev_private;
> @@ -2384,6 +2407,9 @@ static irqreturn_t a6xx_irq(struct msm_gpu *gpu)
>   	if (status & A6XX_RBBM_INT_0_MASK_UCHE_OOB_ACCESS)
>   		dev_err_ratelimited(&gpu->pdev->dev, "UCHE | Out of bounds access\n");
>   
> +	if (status & A6XX_RBBM_INT_0_MASK_SWFUSEVIOLATION)
> +		a7xx_sw_fuse_violation_irq(gpu);
> +
>   	if (status & A6XX_RBBM_INT_0_MASK_CP_CACHE_FLUSH_TS)
>   		msm_gpu_retire(gpu);
>   
> @@ -2525,6 +2551,61 @@ static void a6xx_llc_slices_init(struct platform_device *pdev,
>   		a6xx_gpu->llc_mmio = ERR_PTR(-EINVAL);
>   }
>   
> +static int a7xx_cx_mem_init(struct a6xx_gpu *a6xx_gpu)
> +{
> +	struct adreno_gpu *adreno_gpu = &a6xx_gpu->base;
> +	struct msm_gpu *gpu = &adreno_gpu->base;
> +	u32 fuse_val;
> +	int ret;
> +
> +	if (adreno_is_a750(adreno_gpu)) {
> +		/*
> +		 * Assume that if qcom scm isn't available, that whatever
> +		 * replacement allows writing the fuse register ourselves.
> +		 * Users of alternative firmware need to make sure this
> +		 * register is writeable or indicate that it's not somehow.
> +		 * Print a warning because if you mess this up you're about to
> +		 * crash horribly.
> +		 */
> +		if (!qcom_scm_is_available()) {
> +			dev_warn_once(gpu->dev->dev,
> +				"SCM is not available, poking fuse register\n");
> +			a6xx_llc_write(a6xx_gpu, REG_A7XX_CX_MISC_SW_FUSE_VALUE,
> +				A7XX_CX_MISC_SW_FUSE_VALUE_RAYTRACING |
> +				A7XX_CX_MISC_SW_FUSE_VALUE_FASTBLEND |
> +				A7XX_CX_MISC_SW_FUSE_VALUE_LPAC);
> +			adreno_gpu->has_ray_tracing = true;
> +			return 0;
> +		}
> +
> +		ret = qcom_scm_gpu_init_regs(QCOM_SCM_GPU_ALWAYS_EN_REQ |
> +					     QCOM_SCM_GPU_TSENSE_EN_REQ);
> +		if (ret)
> +			return ret;
> +
> +		/*
> +		 * On a750 raytracing may be disabled by the firmware, find out
> +		 * whether that's the case. The scm call above sets the fuse
> +		 * register.
> +		 */
> +		fuse_val = a6xx_llc_read(a6xx_gpu,
> +					 REG_A7XX_CX_MISC_SW_FUSE_VALUE);
> +		adreno_gpu->has_ray_tracing =
> +			!!(fuse_val & A7XX_CX_MISC_SW_FUSE_VALUE_RAYTRACING);
> +	} else {
> +		if (adreno_is_a740(adreno_gpu)) {
> +			/* Raytracing is always enabled on a740 */
> +			adreno_gpu->has_ray_tracing = true;
> +		}
> +
> +		if (qcom_scm_is_available())
> +			return qcom_scm_gpu_init_regs(QCOM_SCM_GPU_ALWAYS_EN_REQ);
> +	}
> +
> +	return 0;
> +}
> +
> +
>   #define GBIF_CLIENT_HALT_MASK		BIT(0)
>   #define GBIF_ARB_HALT_MASK		BIT(1)
>   #define VBIF_XIN_HALT_CTRL0_MASK	GENMASK(3, 0)
> @@ -3094,6 +3175,14 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev)
>   		return ERR_PTR(ret);
>   	}
>   
> +	if (adreno_is_a7xx(adreno_gpu)) {
> +		ret = a7xx_cx_mem_init(a6xx_gpu);
> +		if (ret) {
> +			a6xx_destroy(&(a6xx_gpu->base.base));
> +			return ERR_PTR(ret);
> +		}
> +	}
> +
>   	if (gpu->aspace)
>   		msm_mmu_set_fault_handler(gpu->aspace->mmu, gpu,
>   				a6xx_fault_handler);
> diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> index 77526892eb8c..4180f3149dd8 100644
> --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> @@ -182,6 +182,8 @@ struct adreno_gpu {
>   	 */
>   	const unsigned int *reg_offsets;
>   	bool gmu_is_wrapper;
> +
> +	bool has_ray_tracing;
>   };
>   #define to_adreno_gpu(x) container_of(x, struct adreno_gpu, base)
>   
> 

This patch break GPU init on SM8450-HDK and SM8550-HDK, call to
qcom_scm_gpu_init_regs(QCOM_SCM_GPU_ALWAYS_EN_REQ) returns -5.

On which device did you test this ?

Neil

  parent reply	other threads:[~2024-06-26  9:33 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-30 10:43 [PATCH v3 0/6] drm/msm: Support a750 "software fuse" for raytracing Connor Abbott
2024-04-30 10:43 ` [PATCH v3 1/6] arm64: dts: qcom: sm8650: Fix GPU cx_mem size Connor Abbott
2024-05-02  8:03   ` Neil Armstrong
2024-04-30 10:43 ` [PATCH v3 2/6] firmware: qcom_scm: Add gpu_init_regs call Connor Abbott
2024-04-30 10:48   ` Konrad Dybcio
2024-05-27  0:03   ` Bjorn Andersson
2024-06-21  5:29   ` (subset) " Bjorn Andersson
2024-04-30 10:43 ` [PATCH v3 3/6] drm/msm: Update a6xx registers Connor Abbott
2024-04-30 10:43 ` [PATCH v3 4/6] drm/msm/a7xx: Initialize a750 "software fuse" Connor Abbott
2024-04-30 10:50   ` Konrad Dybcio
2024-06-26  9:33   ` Neil Armstrong [this message]
2024-06-26 10:05     ` Connor Abbott
2024-04-30 10:43 ` [PATCH v3 5/6] drm/msm: Add MSM_PARAM_RAYTRACING uapi Connor Abbott
2024-04-30 10:43 ` [PATCH v3 6/6] drm/msm/a7xx: Add missing register writes from downstream Connor Abbott
2024-04-30 10:51   ` Konrad Dybcio

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=041cbf33-9fce-4f72-be90-23bc7d215b10@linaro.org \
    --to=neil.armstrong@linaro.org \
    --cc=andersson@kernel.org \
    --cc=conor+dt@kernel.org \
    --cc=cwabbott0@gmail.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dmitry.baryshkov@linaro.org \
    --cc=freedreno@lists.freedesktop.org \
    --cc=jun.nie@linaro.org \
    --cc=konrad.dybcio@linaro.org \
    --cc=krzk+dt@kernel.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=marijn.suijten@somainline.org \
    --cc=quic_abhinavk@quicinc.com \
    --cc=robdclark@gmail.com \
    --cc=robh@kernel.org \
    --cc=sean@poorly.run \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).