Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 01/15] drm/i915/plane: warn on non-zero plane offset
Date: Fri, 26 May 2023 19:49:37 +0300	[thread overview]
Message-ID: <ZHDjIbKT8-X5m5VW@intel.com> (raw)
In-Reply-To: <0988d237e56c56568f035053da8e2e2308a17d3a.1685119007.git.jani.nikula@intel.com>

On Fri, May 26, 2023 at 07:37:54PM +0300, Jani Nikula wrote:
> We assume the plane offset is 0. Warn if it's not. This also fixes a
> warn on unused but set variable offset.
> 
> Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/display/i9xx_plane.c          | 2 ++
>  drivers/gpu/drm/i915/display/skl_universal_plane.c | 1 +
>  2 files changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c
> index 616654adbfb8..b52a681ca85e 100644
> --- a/drivers/gpu/drm/i915/display/i9xx_plane.c
> +++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
> @@ -1037,6 +1037,8 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc,
>  	}
>  	plane_config->base = base;
>  
> +	drm_WARN_ON(&dev_priv->drm, offset != 0);
> +

The gen2/3 codepath doesn't appear to initialize offset at all.

With that fixed this is
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

>  	val = intel_de_read(dev_priv, PIPESRC(pipe));
>  	fb->width = REG_FIELD_GET(PIPESRC_WIDTH_MASK, val) + 1;
>  	fb->height = REG_FIELD_GET(PIPESRC_HEIGHT_MASK, val) + 1;
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index 36070d86550f..6b01a0b68b97 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -2529,6 +2529,7 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
>  	plane_config->base = base;
>  
>  	offset = intel_de_read(dev_priv, PLANE_OFFSET(pipe, plane_id));
> +	drm_WARN_ON(&dev_priv->drm, offset != 0);
>  
>  	val = intel_de_read(dev_priv, PLANE_SIZE(pipe, plane_id));
>  	fb->height = REG_FIELD_GET(PLANE_HEIGHT_MASK, val) + 1;
> -- 
> 2.39.2

-- 
Ville Syrjälä
Intel

  reply	other threads:[~2023-05-26 16:49 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-26 16:37 [Intel-gfx] [PATCH 00/15] drm/i915: re-enable -Wunused-but-set-variable Jani Nikula
2023-05-26 16:37 ` [Intel-gfx] [PATCH 01/15] drm/i915/plane: warn on non-zero plane offset Jani Nikula
2023-05-26 16:49   ` Ville Syrjälä [this message]
2023-05-26 17:22     ` Jani Nikula
2023-05-26 17:22   ` [Intel-gfx] [PATCH v2] " Jani Nikula
2023-05-27  0:27   ` [Intel-gfx] [PATCH 01/15] " kernel test robot
2023-05-27  1:50   ` kernel test robot
2023-05-29  9:24   ` Dan Carpenter
2023-05-29 10:04     ` Jani Nikula
2023-05-26 16:37 ` [Intel-gfx] [PATCH 02/15] drm/i915/ddi: drop unused but set variable intel_dp Jani Nikula
2023-05-26 16:37 ` [Intel-gfx] [PATCH 03/15] drm/i915/dsi: drop unused but set variable data Jani Nikula
2023-05-26 16:37 ` [Intel-gfx] [PATCH 04/15] drm/i915/dsi: drop unused but set variable vbp Jani Nikula
2023-05-26 16:37 ` [Intel-gfx] [PATCH 05/15] drm/i915/dpll: drop unused but set variables bestn and bestm1 Jani Nikula
2023-05-26 16:37 ` [Intel-gfx] [PATCH 06/15] drm/i915/fb: drop unused but set variable cpp Jani Nikula
2023-05-26 16:38 ` [Intel-gfx] [PATCH 07/15] drm/i915/irq: drop unused but set variable tmp Jani Nikula
2023-05-26 16:38 ` [Intel-gfx] [PATCH 08/15] drm/i915/gt/uc: drop unused but set variable sseu Jani Nikula
2023-05-26 17:51   ` Andi Shyti
2023-05-26 16:38 ` [Intel-gfx] [PATCH 09/15] drm/i915/gem: drop unused but set variable unpinned Jani Nikula
2023-05-26 17:35   ` Andi Shyti
2023-05-26 16:38 ` [Intel-gfx] [PATCH 10/15] drm/i915/gem: annotate maybe unused but set variable c Jani Nikula
2023-05-26 17:50   ` Andi Shyti
2023-05-26 16:38 ` [Intel-gfx] [PATCH 11/15] drm/i915/selftest: annotate maybe unused but set variable unused Jani Nikula
2023-05-26 16:38 ` [Intel-gfx] [PATCH 12/15] drm/i915: annotate maybe unused but set intel_plane_state variables Jani Nikula
2023-05-26 16:38 ` [Intel-gfx] [PATCH 13/15] drm/i915: annotate maybe unused but set intel_crtc_state variables Jani Nikula
2023-05-26 16:38 ` [Intel-gfx] [PATCH 14/15] drm/i915/gvt: annotate maybe unused gma_bottom variables Jani Nikula
2023-05-29 14:36   ` Wang, Zhi A
2023-05-26 16:38 ` [Intel-gfx] [PATCH 15/15] drm/i915: re-enable -Wunused-but-set-variable Jani Nikula
2023-05-26 19:14 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: re-enable -Wunused-but-set-variable (rev2) Patchwork
2023-05-26 19:30 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2023-05-26 23:21 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: re-enable -Wunused-but-set-variable (rev3) Patchwork
2023-05-26 23:38 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2023-05-29  9:11 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: re-enable -Wunused-but-set-variable (rev4) Patchwork
2023-05-29  9:25 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-05-29 14:24 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2023-06-07  9:35 ` [Intel-gfx] [PATCH 00/15] drm/i915: re-enable -Wunused-but-set-variable Hogander, Jouni
2023-06-07 10:37   ` Jani Nikula
2023-06-08  9:05     ` Jani Nikula

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=ZHDjIbKT8-X5m5VW@intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@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