From: "Lisovskiy, Stanislav" <stanislav.lisovskiy@intel.com>
To: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Don't zero out the Y plane's watermarks
Date: Thu, 8 Apr 2021 12:48:42 +0300 [thread overview]
Message-ID: <20210408094842.GA14051@intel.com> (raw)
In-Reply-To: <20210327005945.4929-1-ville.syrjala@linux.intel.com>
On Sat, Mar 27, 2021 at 02:59:45AM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Don't zero out the watermarks for the Y plane since we've already
> computed them when computing the UV plane's watermarks (since the
> UV plane always appears before ethe Y plane when iterating through
> the planes).
>
> This leads to allocating no DDB for the Y plane since .min_ddb_alloc
> also gets zeroed. And that of course leads to underruns when scanning
> out planar formats.
>
> We really need to re-enable the pre-merge pixel format tests or else
> I'll just keep breaking this stuff...
Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
>
> Cc: stable@vger.kernel.org
> Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
> Fixes: dbf71381d733 ("drm/i915: Nuke intel_atomic_crtc_state_for_each_plane_state() from skl+ wm code")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index b2aede2be89d..49c19acdb7c6 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -5511,12 +5511,12 @@ static int icl_build_plane_wm(struct intel_crtc_state *crtc_state,
> struct skl_plane_wm *wm = &crtc_state->wm.skl.raw.planes[plane_id];
> int ret;
>
> - memset(wm, 0, sizeof(*wm));
> -
> /* Watermarks calculated in master */
> if (plane_state->planar_slave)
> return 0;
>
> + memset(wm, 0, sizeof(*wm));
> +
> if (plane_state->planar_linked_plane) {
> const struct drm_framebuffer *fb = plane_state->hw.fb;
> enum plane_id y_plane_id = plane_state->planar_linked_plane->id;
> --
> 2.26.2
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2021-04-08 9:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-27 0:59 [Intel-gfx] [PATCH] drm/i915: Don't zero out the Y plane's watermarks Ville Syrjala
2021-03-27 1:18 ` [Intel-gfx] ✗ Fi.CI.DOCS: warning for " Patchwork
2021-03-27 1:43 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-03-27 3:29 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-04-08 9:48 ` Lisovskiy, Stanislav [this message]
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=20210408094842.GA14051@intel.com \
--to=stanislav.lisovskiy@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=stable@vger.kernel.org \
--cc=ville.syrjala@linux.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