From: Jani Nikula <jani.nikula@intel.com>
To: Aditya Swarup <aditya.swarup@intel.com>, intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH v2] drm/i915/display: Add max plane width for NV12 AUX plane for Gen10+ platforms
Date: Wed, 16 Sep 2020 10:35:31 +0300 [thread overview]
Message-ID: <87pn6mw4vw.fsf@intel.com> (raw)
In-Reply-To: <20200916021541.500501-1-aditya.swarup@intel.com>
On Tue, 15 Sep 2020, Aditya Swarup <aditya.swarup@intel.com> wrote:
> Gen 10+ and Gen11+ platforms specify different max plane width for
> planar formats. Add max plane width for GLK and ICL based on
> BSpec: 7666
>
> Fixes: 372b9ffb5799 ("drm/i915: Fix skl+ max plane width")
>
Fixes is part of the tags; no blank lines here please.
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Matt Roper <matthew.d.roper@intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Imre Deak <imre.deak@intel.com>
> Signed-off-by: Aditya Swarup <aditya.swarup@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index f862403388f6..116fed1b7306 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -3989,7 +3989,7 @@ static int skl_check_nv12_aux_surface(struct intel_plane_state *plane_state)
> const struct drm_framebuffer *fb = plane_state->hw.fb;
> unsigned int rotation = plane_state->hw.rotation;
> int uv_plane = 1;
> - int max_width = skl_max_plane_width(fb, uv_plane, rotation);
> + int max_width = 0;
We don't usually initialize to zero when all code paths below initialize
the variable before first use.
> int max_height = 4096;
> int x = plane_state->uapi.src.x1 >> 17;
> int y = plane_state->uapi.src.y1 >> 17;
> @@ -3997,6 +3997,13 @@ static int skl_check_nv12_aux_surface(struct intel_plane_state *plane_state)
> int h = drm_rect_height(&plane_state->uapi.src) >> 17;
> u32 offset;
>
> + if (INTEL_GEN(i915) >= 11)
> + max_width = icl_max_plane_width(fb, uv_plane, rotation);
> + else if (INTEL_GEN(i915) >= 10 || IS_GEMINILAKE(i915))
> + max_width = glk_max_plane_width(fb, uv_plane, rotation);
> + else
> + max_width = skl_max_plane_width(fb, uv_plane, rotation);
> +
> intel_add_fb_offsets(&x, &y, plane_state, uv_plane);
> offset = intel_plane_compute_aligned_offset(&x, &y,
> plane_state, uv_plane);
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2020-09-16 7:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-16 2:15 [Intel-gfx] [PATCH v2] drm/i915/display: Add max plane width for NV12 AUX plane for Gen10+ platforms Aditya Swarup
2020-09-16 2:55 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/display: Add max plane width for NV12 AUX plane for Gen10+ platforms (rev2) Patchwork
2020-09-16 4:45 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2020-09-16 7:35 ` Jani Nikula [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=87pn6mw4vw.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=aditya.swarup@intel.com \
--cc=intel-gfx@lists.freedesktop.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox