From: Nirmoy Das <nirmoy.das@linux.intel.com>
To: Nirmoy Das <nirmoy.das@intel.com>, intel-gfx@lists.freedesktop.org
Cc: Andrzej Hajda <andrzej.hajda@intel.com>
Subject: Re: [Intel-gfx] [PATCH v2 2/2] drm/i915/display: Do not use stolen on MTL
Date: Thu, 13 Jul 2023 16:45:19 +0200 [thread overview]
Message-ID: <6d3e7ee4-4ba9-d3ee-0409-780b75c05a0b@linux.intel.com> (raw)
In-Reply-To: <20230711220648.17108-2-nirmoy.das@intel.com>
On 7/12/2023 12:06 AM, Nirmoy Das wrote:
> Use smem on MTL due to a HW bug in MTL that prevents
> reading from stolen memory using LMEM BAR.
>
> v2: improve stolen skip detection(Andrzej)
>
> Cc: Oak Zeng <oak.zeng@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Andi Shyti <andi.shyti@linux.intel.com>
> Cc: Andrzej Hajda <andrzej.hajda@intel.com>
> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
> Reviewed-by: Oak Zeng <oak.zeng@intel.com>
> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_fbdev.c | 5 ++++-
> drivers/gpu/drm/i915/display/intel_overlay.c | 5 +++--
> 2 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
> index 1cc0ddc6a310..e019bbcd474e 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbdev.c
> +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
> @@ -187,8 +187,11 @@ static int intelfb_alloc(struct drm_fb_helper *helper,
> * If the FB is too big, just don't use it since fbdev is not very
> * important and we should probably use that space with FBC or other
> * features.
> + *
> + * Also skip stolen on MTL as Wa_22018444074 mitigation.
> */
> - if (size * 2 < dev_priv->dsm.usable_size)
> + if (size * 2 < dev_priv->dsm.usable_size ||
> + !(IS_METEORLAKE(dev_priv)))
Just realized this is wrong, stolen will be picked on non-mtl even if
the stolen usable size is < 2*size which is not expected.
I will keep this as v1
Regards,
Nirmoy
> obj = i915_gem_object_create_stolen(dev_priv, size);
> if (IS_ERR(obj))
> obj = i915_gem_object_create_shmem(dev_priv, size);
> diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c
> index d6fe2bbabe55..09c1aa1427ad 100644
> --- a/drivers/gpu/drm/i915/display/intel_overlay.c
> +++ b/drivers/gpu/drm/i915/display/intel_overlay.c
> @@ -1348,11 +1348,12 @@ int intel_overlay_attrs_ioctl(struct drm_device *dev, void *data,
> static int get_registers(struct intel_overlay *overlay, bool use_phys)
> {
> struct drm_i915_private *i915 = overlay->i915;
> - struct drm_i915_gem_object *obj;
> + struct drm_i915_gem_object *obj = ERR_PTR(-ENODEV);
> struct i915_vma *vma;
> int err;
>
> - obj = i915_gem_object_create_stolen(i915, PAGE_SIZE);
> + if (!IS_METEORLAKE(i915)) /* Wa_22018444074 */
> + obj = i915_gem_object_create_stolen(i915, PAGE_SIZE);
> if (IS_ERR(obj))
> obj = i915_gem_object_create_internal(i915, PAGE_SIZE);
> if (IS_ERR(obj))
next prev parent reply other threads:[~2023-07-13 14:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-11 22:06 [Intel-gfx] [PATCH 1/2] drm/i915/gt: Do not use stolen on MTL Nirmoy Das
2023-07-11 22:06 ` [Intel-gfx] [PATCH v2 2/2] drm/i915/display: " Nirmoy Das
2023-07-13 14:45 ` Nirmoy Das [this message]
2023-07-13 14:56 ` Andrzej Hajda
2023-07-13 15:02 ` Nirmoy Das
2023-07-11 23:20 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/2] drm/i915/gt: " Patchwork
2023-07-11 23:29 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-07-12 2:04 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
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=6d3e7ee4-4ba9-d3ee-0409-780b75c05a0b@linux.intel.com \
--to=nirmoy.das@linux.intel.com \
--cc=andrzej.hajda@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=nirmoy.das@intel.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