Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
MIME-Version: 1.0
References: <20231101210037.130494-1-hamza.mahfooz@amd.com>
In-Reply-To: <20231101210037.130494-1-hamza.mahfooz@amd.com>
From:   Alex Deucher <alexdeucher@gmail.com>
Date:   Wed, 1 Nov 2023 17:36:24 -0400
Message-ID: <CADnq5_Nv0MnG+pPvRQO37OP8iYwz8oGvFLs2g-+U=URHWcqJGw@mail.gmail.com>
Subject: Re: [PATCH] drm/edid: add a quirk for two 240Hz Samsung monitors
To:     Hamza Mahfooz <hamza.mahfooz@amd.com>
Cc:     dri-devel@lists.freedesktop.org,
        Maxime Ripard <mripard@kernel.org>,
        amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org,
        stable@vger.kernel.org, Jerry Zuo <jerry.zuo@amd.com>,
        Aurabindo Pillai <aurabindo.pillai@amd.com>,
        Thomas Zimmermann <tzimmermann@suse.de>,
        Alex Deucher <alexander.deucher@amd.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Wed, Nov 1, 2023 at 5:01=E2=80=AFPM Hamza Mahfooz <hamza.mahfooz@amd.com=
> wrote:
>
> Without this fix the 5120x1440@240 timing of these monitors
> leads to screen flickering.
>
> Cc: stable@vger.kernel.org # 6.1+
> Link: https://gitlab.freedesktop.org/drm/amd/-/issues/1442
> Co-developed-by: Harry Wentland <harry.wentland@amd.com>
> Signed-off-by: Harry Wentland <harry.wentland@amd.com>
> Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
> ---
>  drivers/gpu/drm/drm_edid.c | 47 +++++++++++++++++++++++++++++++++++---
>  1 file changed, 44 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index bca2af4fe1fc..3fdb8907f66b 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -89,6 +89,8 @@ static int oui(u8 first, u8 second, u8 third)
>  #define EDID_QUIRK_NON_DESKTOP                 (1 << 12)
>  /* Cap the DSC target bitrate to 15bpp */
>  #define EDID_QUIRK_CAP_DSC_15BPP               (1 << 13)
> +/* Fix up a particular 5120x1440@240Hz timing */
> +#define EDID_QUIRK_FIXUP_5120_1440_240         (1 << 14)

What is wrong with the original timing that needs to be fixed?

Alex


>
>  #define MICROSOFT_IEEE_OUI     0xca125c
>
> @@ -170,6 +172,12 @@ static const struct edid_quirk {
>         EDID_QUIRK('S', 'A', 'M', 596, EDID_QUIRK_PREFER_LARGE_60),
>         EDID_QUIRK('S', 'A', 'M', 638, EDID_QUIRK_PREFER_LARGE_60),
>
> +       /* Samsung C49G95T */
> +       EDID_QUIRK('S', 'A', 'M', 0x7053, EDID_QUIRK_FIXUP_5120_1440_240)=
,
> +
> +       /* Samsung S49AG95 */
> +       EDID_QUIRK('S', 'A', 'M', 0x71ac, EDID_QUIRK_FIXUP_5120_1440_240)=
,
> +
>         /* Sony PVM-2541A does up to 12 bpc, but only reports max 8 bpc *=
/
>         EDID_QUIRK('S', 'N', 'Y', 0x2541, EDID_QUIRK_FORCE_12BPC),
>
> @@ -6586,7 +6594,37 @@ static void update_display_info(struct drm_connect=
or *connector,
>         drm_edid_to_eld(connector, drm_edid);
>  }
>
> -static struct drm_display_mode *drm_mode_displayid_detailed(struct drm_d=
evice *dev,
> +static void drm_mode_displayid_detailed_edid_quirks(struct drm_connector=
 *connector,
> +                                                   struct drm_display_mo=
de *mode)
> +{
> +       unsigned int hsync_width;
> +       unsigned int vsync_width;
> +
> +       if (connector->display_info.quirks & EDID_QUIRK_FIXUP_5120_1440_2=
40) {
> +               if (mode->hdisplay =3D=3D 5120 && mode->vdisplay =3D=3D 1=
440 &&
> +                   mode->clock =3D=3D 1939490) {
> +                       hsync_width =3D mode->hsync_end - mode->hsync_sta=
rt;
> +                       vsync_width =3D mode->vsync_end - mode->vsync_sta=
rt;
> +
> +                       mode->clock =3D 2018490;
> +                       mode->hdisplay =3D 5120;
> +                       mode->hsync_start =3D 5120 + 8;
> +                       mode->hsync_end =3D 5120 + 8 + hsync_width;
> +                       mode->htotal =3D 5200;
> +
> +                       mode->vdisplay =3D 1440;
> +                       mode->vsync_start =3D 1440 + 165;
> +                       mode->vsync_end =3D 1440 + 165 + vsync_width;
> +                       mode->vtotal =3D 1619;
> +
> +                       drm_dbg_kms(connector->dev,
> +                                   "[CONNECTOR:%d:%s] Samsung 240Hz mode=
 quirk applied\n",
> +                                   connector->base.id, connector->name);
> +               }
> +       }
> +}
> +
> +static struct drm_display_mode *drm_mode_displayid_detailed(struct drm_c=
onnector *connector,
>                                                             struct displa=
yid_detailed_timings_1 *timings,
>                                                             bool type_7)
>  {
> @@ -6605,7 +6643,7 @@ static struct drm_display_mode *drm_mode_displayid_=
detailed(struct drm_device *d
>         bool hsync_positive =3D (timings->hsync[1] >> 7) & 0x1;
>         bool vsync_positive =3D (timings->vsync[1] >> 7) & 0x1;
>
> -       mode =3D drm_mode_create(dev);
> +       mode =3D drm_mode_create(connector->dev);
>         if (!mode)
>                 return NULL;
>
> @@ -6628,6 +6666,9 @@ static struct drm_display_mode *drm_mode_displayid_=
detailed(struct drm_device *d
>
>         if (timings->flags & 0x80)
>                 mode->type |=3D DRM_MODE_TYPE_PREFERRED;
> +
> +       drm_mode_displayid_detailed_edid_quirks(connector, mode);
> +
>         drm_mode_set_name(mode);
>
>         return mode;
> @@ -6650,7 +6691,7 @@ static int add_displayid_detailed_1_modes(struct dr=
m_connector *connector,
>         for (i =3D 0; i < num_timings; i++) {
>                 struct displayid_detailed_timings_1 *timings =3D &det->ti=
mings[i];
>
> -               newmode =3D drm_mode_displayid_detailed(connector->dev, t=
imings, type_7);
> +               newmode =3D drm_mode_displayid_detailed(connector, timing=
s, type_7);
>                 if (!newmode)
>                         continue;
>
> --
> 2.42.0
>