From: "Nautiyal, Ankit K" <ankit.k.nautiyal@intel.com>
To: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
Cc: <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH] drm/i915/scaler: Update Pipe src size check for DISPLAY_VER >= 12
Date: Wed, 6 Mar 2024 18:28:53 +0530 [thread overview]
Message-ID: <a877bd6b-7035-4651-972c-4c62399fc083@intel.com> (raw)
In-Reply-To: <Zec5l8v6OAJCqYZs@intel.com>
On 3/5/2024 8:56 PM, Ville Syrjälä wrote:
> On Mon, Feb 19, 2024 at 11:22:55AM +0530, Ankit Nautiyal wrote:
>> For Earlier platforms, the Pipe source size is 12-bits so
>> max pipe source width and height is 4096. For newer platforms it is
>> 13-bits so theoretically max height is 8192, but maximum width
>> supported on a single pipe is 5120, beyond which we need to use
>> bigjoiner.
>>
>> Currently we are using max scaler source size to make sure that the
>> pipe source size is programmed within limits, before using scaler.
>> This creates a problem, for MTL where scaler source size is 4096, but
>> max pipe source width can be 5120.
>>
>> Update the check to use the aforementioned limits.
>>
>> Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
>> ---
>> drivers/gpu/drm/i915/display/skl_scaler.c | 19 +++++++++++++++----
>> 1 file changed, 15 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c b/drivers/gpu/drm/i915/display/skl_scaler.c
>> index 8a934bada624..36342142efaa 100644
>> --- a/drivers/gpu/drm/i915/display/skl_scaler.c
>> +++ b/drivers/gpu/drm/i915/display/skl_scaler.c
>> @@ -115,6 +115,7 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach,
>> int pipe_src_h = drm_rect_height(&crtc_state->pipe_src);
>> int min_src_w, min_src_h, min_dst_w, min_dst_h;
>> int max_src_w, max_src_h, max_dst_w, max_dst_h;
>> + int max_pipe_src_w, max_pipe_src_h;
>>
>> /*
>> * Src coordinates are already rotated by 270 degrees for
>> @@ -212,11 +213,21 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach,
>> /*
>> * The pipe scaler does not use all the bits of PIPESRC, at least
>> * on the earlier platforms. So even when we're scaling a plane
>> - * the *pipe* source size must not be too large. For simplicity
>> - * we assume the limits match the scaler source size limits. Might
>> - * not be 100% accurate on all platforms, but good enough for now.
>> + * the *pipe* source size must not be too large.
>> + *
>> + * For Earlier platforms, the Pipe source size is 12-bits so
>> + * max pipe src width and height is 4096. For newer platforms it is 13-bits.
>> + * Theoretically maximum pipe src height supported on a single pipe is 8192,
>> + * but maximum pipe src width supported on a single pipe is 5120.
>> */
>> - if (pipe_src_w > max_src_w || pipe_src_h > max_src_h) {
>> + if (DISPLAY_VER(dev_priv) < 12) {
>> + max_pipe_src_w = 4096;
>> + max_pipe_src_h = 4096;
> That doesn't seem right.
>
> Hmm. We should probably we able to just switch this to check
> against the max dst size instead of the max src size.
Alright, so will change the condition to:
if (pipe_src_w > max_dst_w || pipe_src_h > max_dst_h) {
... return -EINVAL;
}
So till ICL it will still have no difference, but for TGL,MTL we'll be checking with 8192:
SKL_MAX_DST_W 4096 ; SKL_MAX_SRC_W 4096
SKL_MAX_DST_H 4096 ; SKL_MAX_SRC_H 4096
ICL_MAX_DST_W 5120 ; ICL_MAX_SRC_W 5120
ICL_MAX_DST_H 4096 ; ICL_MAX_SRC_H 4096
TGL_MAX_DST_W 8192 ; TGL_MAX_SRC_W 5120
TGL_MAX_DST_H 8192 ; TGL_MAX_SRC_H 8192
MTL_MAX_DST_W 8192 ; MTL_MAX_SRC_W 4096
MTL_MAX_DST_H 8192 ; MTL_MAX_SRC_H 8192
(Scaler + bigjoiner still needs some work, will start planning for that soon.)
Thanks & Regards,
Ankit
>
>> + } else {
>> + max_pipe_src_w = 5120;
>> + max_pipe_src_h = 8192;
>> + }
>> + if (pipe_src_w > max_pipe_src_w || pipe_src_h > max_pipe_src_h) {
>> drm_dbg_kms(&dev_priv->drm,
>> "scaler_user index %u.%u: pipe src size %ux%u "
>> "is out of scaler range\n",
>> --
>> 2.40.1
prev parent reply other threads:[~2024-03-06 12:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-19 5:52 [PATCH] drm/i915/scaler: Update Pipe src size check for DISPLAY_VER >= 12 Ankit Nautiyal
2024-02-19 6:59 ` ✓ Fi.CI.BAT: success for " Patchwork
2024-02-19 8:27 ` ✓ Fi.CI.IGT: " Patchwork
2024-03-05 15:26 ` [PATCH] " Ville Syrjälä
2024-03-06 12:58 ` Nautiyal, Ankit K [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=a877bd6b-7035-4651-972c-4c62399fc083@intel.com \
--to=ankit.k.nautiyal@intel.com \
--cc=intel-gfx@lists.freedesktop.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