From: Jordan Crouse <jcrouse@codeaurora.org>
To: Jonathan Marek <jonathan@marek.ca>
Cc: freedreno@lists.freedesktop.org, Rob Clark <robdclark@gmail.com>,
Sean Paul <sean@poorly.run>, David Airlie <airlied@linux.ie>,
Daniel Vetter <daniel@ffwll.ch>,
Jeffrey Hugo <jeffrey.l.hugo@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Sharat Masetty <smasetty@codeaurora.org>,
AngeloGioacchino Del Regno <kholk11@gmail.com>,
Brian Masney <masneyb@onstation.org>,
Fabio Estevam <festevam@gmail.com>,
Douglas Anderson <dianders@chromium.org>,
Enrico Weigelt <info@metux.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Allison Randal <allison@lohutok.net>,
Wambui Karuga <wambui.karugax@gmail.com>,
"open list:DRM DRIVER FOR MSM ADRENO GPU"
<linux-arm-msm@vger.kernel.org>,
"open list:DRM DRIVER FOR MSM ADRENO GPU"
<dri-devel@lists.freedesktop.org>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 4/9] drm/msm/a6xx: add A640/A650 to gpulist
Date: Thu, 23 Apr 2020 09:38:38 -0600 [thread overview]
Message-ID: <20200423153837.GB15079@jcrouse1-lnx.qualcomm.com> (raw)
In-Reply-To: <20200421234127.27965-5-jonathan@marek.ca>
On Tue, Apr 21, 2020 at 07:41:22PM -0400, Jonathan Marek wrote:
> Add Adreno 640 and 650 GPU info to the gpulist.
>
Reviewed-by: Jordan Crouse <jcrouse@codeaurora.org>
> Signed-off-by: Jonathan Marek <jonathan@marek.ca>
> ---
> drivers/gpu/drm/msm/adreno/adreno_device.c | 24 ++++++++++++++++++++++
> drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +-
> drivers/gpu/drm/msm/adreno/adreno_gpu.h | 10 +++++++++
> 3 files changed, 35 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c
> index cb3a6e597d76..1156f72532a4 100644
> --- a/drivers/gpu/drm/msm/adreno/adreno_device.c
> +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
> @@ -189,6 +189,30 @@ static const struct adreno_info gpulist[] = {
> .inactive_period = DRM_MSM_INACTIVE_PERIOD,
> .init = a6xx_gpu_init,
> .zapfw = "a630_zap.mdt",
> + }, {
> + .rev = ADRENO_REV(6, 4, 0, ANY_ID),
> + .revn = 640,
> + .name = "A640",
> + .fw = {
> + [ADRENO_FW_SQE] = "a630_sqe.fw",
> + [ADRENO_FW_GMU] = "a640_gmu.bin",
> + },
> + .gmem = SZ_1M,
> + .inactive_period = DRM_MSM_INACTIVE_PERIOD,
> + .init = a6xx_gpu_init,
> + .zapfw = "a640_zap.mdt",
> + }, {
> + .rev = ADRENO_REV(6, 5, 0, ANY_ID),
> + .revn = 650,
> + .name = "A650",
> + .fw = {
> + [ADRENO_FW_SQE] = "a650_sqe.fw",
> + [ADRENO_FW_GMU] = "a650_gmu.bin",
> + },
> + .gmem = SZ_1M + SZ_128K,
> + .inactive_period = DRM_MSM_INACTIVE_PERIOD,
> + .init = a6xx_gpu_init,
> + .zapfw = "a650_zap.mdt",
> },
> };
>
> diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
> index 1d5c43c22269..a7647eaacc7a 100644
> --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
> +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
> @@ -197,7 +197,7 @@ int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value)
> *value = adreno_gpu->gmem;
> return 0;
> case MSM_PARAM_GMEM_BASE:
> - *value = 0x100000;
> + *value = !adreno_is_a650(adreno_gpu) ? 0x100000 : 0;
This will likely be 0 from here on out. This is okay for now, but we might need
to consider adding the gmem base to the GPU list to avoid some ugly
conditionals.
> return 0;
> case MSM_PARAM_CHIP_ID:
> *value = adreno_gpu->rev.patchid |
> diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> index 9ff4e550e7bd..88ae1b2813ef 100644
> --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> @@ -237,6 +237,16 @@ static inline int adreno_is_a630(struct adreno_gpu *gpu)
> return gpu->revn == 630;
> }
>
> +static inline int adreno_is_a640(struct adreno_gpu *gpu)
> +{
> + return gpu->revn == 640;
> +}
> +
> +static inline int adreno_is_a650(struct adreno_gpu *gpu)
> +{
> + return gpu->revn == 650;
> +}
> +
> 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);
> --
> 2.26.1
>
--
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2020-04-23 15:38 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200421234127.27965-1-jonathan@marek.ca>
2020-04-21 23:41 ` [PATCH v2 1/9] drm/msm: add msm_gem_get_and_pin_iova_range Jonathan Marek
2020-04-21 23:41 ` [PATCH v2 2/9] drm/msm: add internal MSM_BO_MAP_PRIV flag Jonathan Marek
2020-04-23 15:25 ` [Freedreno] " Jordan Crouse
2020-04-21 23:41 ` [PATCH v2 3/9] drm/msm/a6xx: use msm_gem for GMU memory objects Jonathan Marek
2020-04-23 15:34 ` Jordan Crouse
2020-04-21 23:41 ` [PATCH v2 4/9] drm/msm/a6xx: add A640/A650 to gpulist Jonathan Marek
2020-04-23 15:38 ` Jordan Crouse [this message]
2020-04-21 23:41 ` [PATCH v2 5/9] drm/msm/a6xx: HFI v2 for A640 and A650 Jonathan Marek
2020-04-23 16:25 ` Jordan Crouse
2020-04-21 23:41 ` [PATCH v2 6/9] drm/msm/a6xx: A640/A650 GMU firmware path Jonathan Marek
2020-04-23 16:20 ` Jordan Crouse
2020-04-23 17:36 ` Ruhl, Michael J
2020-04-21 23:41 ` [PATCH v2 7/9] drm/msm/a6xx: update pdc/rscc GMU registers for A640/A650 Jonathan Marek
2020-04-23 15:53 ` Jordan Crouse
2020-04-21 23:41 ` [PATCH v2 8/9] drm/msm/a6xx: enable GMU log Jonathan Marek
2020-04-23 16:21 ` Jordan Crouse
2020-04-21 23:41 ` [PATCH v2 9/9] drm/msm/a6xx: update a6xx_hw_init for A640 and A650 Jonathan Marek
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=20200423153837.GB15079@jcrouse1-lnx.qualcomm.com \
--to=jcrouse@codeaurora.org \
--cc=airlied@linux.ie \
--cc=allison@lohutok.net \
--cc=bjorn.andersson@linaro.org \
--cc=daniel@ffwll.ch \
--cc=dianders@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=festevam@gmail.com \
--cc=freedreno@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=info@metux.net \
--cc=jeffrey.l.hugo@gmail.com \
--cc=jonathan@marek.ca \
--cc=kholk11@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masneyb@onstation.org \
--cc=robdclark@gmail.com \
--cc=sean@poorly.run \
--cc=smasetty@codeaurora.org \
--cc=tglx@linutronix.de \
--cc=wambui.karugax@gmail.com \
/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).