From: Tomeu Vizoso <tomeu@tomeuvizoso.net>
To: Christian Gmeiner <christian.gmeiner@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>,
Russell King <linux+etnaviv@armlinux.org.uk>,
David Airlie <airlied@gmail.com>,
Daniel Vetter <daniel@ffwll.ch>,
Christian Gmeiner <cgmeiner@igalia.com>,
stable@vger.kernel.org, etnaviv@lists.freedesktop.org,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] etnaviv: Restore some id values
Date: Fri, 1 Mar 2024 10:27:47 +0100 [thread overview]
Message-ID: <CAAObsKBEV0q78CFmy1ezwKLQEY0hLDn4ct0UxedGKVZM7tCKeg@mail.gmail.com> (raw)
In-Reply-To: <20240229195532.7815-1-christian.gmeiner@gmail.com>
On Thu, Feb 29, 2024 at 8:55 PM Christian Gmeiner
<christian.gmeiner@gmail.com> wrote:
>
> From: Christian Gmeiner <cgmeiner@igalia.com>
>
> The hwdb selection logic as a feature that allows it to mark some fields
> as 'don't care'. If we match with such a field we memcpy(..)
> the current etnaviv_chip_identity into ident.
>
> This step can overwrite some id values read from the GPU with the
> 'don't care' value.
>
> Fix this issue by restoring the affected values after the memcpy(..).
>
> As this is crucial for user space to know when this feature works as
> expected increment the minor version too.
>
> Fixes: 4078a1186dd3 ("drm/etnaviv: update hwdb selection logic")
> Cc: stable@vger.kernel.org
Oops.
Reviewed-by: Tomeu Vizoso <tomeu@tomeuvizoso.net>
Cheers,
Tomeu
> Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
> ---
> drivers/gpu/drm/etnaviv/etnaviv_drv.c | 2 +-
> drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 14 ++++++++++++++
> 2 files changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> index 6228ce603248..9a2965741dab 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> @@ -494,7 +494,7 @@ static const struct drm_driver etnaviv_drm_driver = {
> .desc = "etnaviv DRM",
> .date = "20151214",
> .major = 1,
> - .minor = 3,
> + .minor = 4,
> };
>
> /*
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c b/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c
> index 67201242438b..1e38d66702f1 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c
> @@ -265,6 +265,9 @@ static const struct etnaviv_chip_identity etnaviv_chip_identities[] = {
> bool etnaviv_fill_identity_from_hwdb(struct etnaviv_gpu *gpu)
> {
> struct etnaviv_chip_identity *ident = &gpu->identity;
> + const u32 product_id = ident->product_id;
> + const u32 customer_id = ident->customer_id;
> + const u32 eco_id = ident->eco_id;
> int i;
>
> for (i = 0; i < ARRAY_SIZE(etnaviv_chip_identities); i++) {
> @@ -278,6 +281,17 @@ bool etnaviv_fill_identity_from_hwdb(struct etnaviv_gpu *gpu)
> etnaviv_chip_identities[i].eco_id == ~0U)) {
> memcpy(ident, &etnaviv_chip_identities[i],
> sizeof(*ident));
> +
> + /* Restore some id values if ~0U aka 'don't care' is used. */
> + if (etnaviv_chip_identities[i].product_id == ~0U)
> + ident->product_id = product_id;
> +
> + if (etnaviv_chip_identities[i].customer_id == ~0U)
> + ident->customer_id = customer_id;
> +
> + if (etnaviv_chip_identities[i].eco_id == ~0U)
> + ident->eco_id = eco_id;
> +
> return true;
> }
> }
> --
> 2.44.0
>
next prev parent reply other threads:[~2024-03-01 9:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-29 19:55 [PATCH] etnaviv: Restore some id values Christian Gmeiner
2024-03-01 9:27 ` Tomeu Vizoso [this message]
2024-03-01 10:08 ` Lucas Stach
2024-03-01 13:30 ` Christian Gmeiner
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=CAAObsKBEV0q78CFmy1ezwKLQEY0hLDn4ct0UxedGKVZM7tCKeg@mail.gmail.com \
--to=tomeu@tomeuvizoso.net \
--cc=airlied@gmail.com \
--cc=cgmeiner@igalia.com \
--cc=christian.gmeiner@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=etnaviv@lists.freedesktop.org \
--cc=l.stach@pengutronix.de \
--cc=linux+etnaviv@armlinux.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.