[PATCH 1/4] drm/i915/xe3lpd: Increase resolution for plane to support 6k

[Nautiyal, Ankit K]

On 10/24/2024 9:25 AM, Suraj Kandpal wrote:
> DISPLAY_VER >= 30 onwards CRTC can now support 6k resolution.
> Increase pipe and plane max width and height to reflect this

Only max width is changed.

> increase in resolution.
>
> --v2
> -Take care of the subsampling scenario sooner rather than later [Matt]
>
> Signed-off-by: Arun R Murthy <arun.r.murthy at intel.com>
> Signed-off-by: Suraj Kandpal <suraj.kandpal at intel.com>
> ---
>   drivers/gpu/drm/i915/display/intel_display.c     |  5 ++++-
>   .../gpu/drm/i915/display/skl_universal_plane.c   | 16 +++++++++++++++-
>   2 files changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index e1f6255e918b..37bac53f996e 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -8432,7 +8432,10 @@ intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv,
>   	 * plane so let's not advertize modes that are
>   	 * too big for that.
>   	 */
> -	if (DISPLAY_VER(dev_priv) >= 11) {
> +	if (DISPLAY_VER(dev_priv) >= 30) {
> +		plane_width_max = 6144 * num_joined_pipes;
> +		plane_height_max = 4096;

plane_height_max is not changed, should be 4320.

Otherwise looks good to me. With the above fixed:

Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal at intel.com>


> +	} else if (DISPLAY_VER(dev_priv) >= 11) {
>   		plane_width_max = 5120 * num_joined_pipes;
>   		plane_height_max = 4320;
>   	} else {
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index 9207b7e96974..b3660c71e499 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -432,6 +432,16 @@ static int icl_plane_min_width(const struct drm_framebuffer *fb,
>   	}
>   }
>   
> +static int xe3_plane_max_width(const struct drm_framebuffer *fb,
> +			       int color_plane,
> +			       unsigned int rotation)
> +{
> +	if (intel_format_info_is_yuv_semiplanar(fb->format, fb->modifier))
> +		return 4096;
> +	else
> +		return 6144;
> +}
> +
>   static int icl_hdr_plane_max_width(const struct drm_framebuffer *fb,
>   				   int color_plane,
>   				   unsigned int rotation)
> @@ -2511,7 +2521,11 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,
>   
>   	intel_fbc_add_plane(skl_plane_fbc(dev_priv, pipe, plane_id), plane);
>   
> -	if (DISPLAY_VER(dev_priv) >= 11) {
> +	if (DISPLAY_VER(dev_priv) >= 30) {
> +		plane->max_width = xe3_plane_max_width;
> +		plane->max_height = icl_plane_max_height;
> +		plane->min_cdclk = icl_plane_min_cdclk;
> +	} else if (DISPLAY_VER(dev_priv) >= 11) {
>   		plane->min_width = icl_plane_min_width;
>   		if (icl_is_hdr_plane(dev_priv, plane_id))
>   			plane->max_width = icl_hdr_plane_max_width;