[Public] > -----Original Message----- > From: Limonciello, Mario > Sent: Monday, June 26, 2023 12:45 PM > To: Hersen Wu <hersenxs.wu@xxxxxxx>; amd-gfx@xxxxxxxxxxxxxxxxxxxxx; > Wentland, Harry <Harry.Wentland@xxxxxxx> > Cc: Wu, Hersen <hersenxs.wu@xxxxxxx> > Subject: RE: [PATCH] Revert "drm/amd/display: edp do not add non-edid > timings" > > > This change causes regression when eDP and external display in mirror > > mode. When external display supports low resolution than eDP, use eDP > > timing to driver external display may cause corruption on external > > display. > > > > This reverts commit aa9704d5127f06c9ffedb0480d2788b87fecedfb. One more thing - although this is the correct hash for ASDN, this merged into Linus' tree as e749dd10e5f292061ad63d2b030194bf7d7d452c. As this has to go back to stable trees properly, I think the hash should reflect what's in Linus' tree instead of what's in ASDN. > > > > Signed-off-by: Hersen Wu <hersenxs.wu@xxxxxxx> > > The original commit CC to stable, we need this to go to stable too. > > Here's some tags to pick up when merging. > > Cc: stable@xxxxxxxxxxxxxxx > Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2655 > Reviewed-by: Mario Limonciello <mario.limonciello@xxxxxxx> > > > --- > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +------- > > 1 file changed, 1 insertion(+), 7 deletions(-) > > > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > index a46b8b47b756..073bf00c6fdc 100644 > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > @@ -7258,13 +7258,7 @@ static int > > amdgpu_dm_connector_get_modes(struct drm_connector *connector) > > drm_add_modes_noedid(connector, 1920, > > 1080); > > } else { > > amdgpu_dm_connector_ddc_get_modes(connector, edid); > > - /* most eDP supports only timings from its edid, > > - * usually only detailed timings are available > > - * from eDP edid. timings which are not from edid > > - * may damage eDP > > - */ > > - if (connector->connector_type != > > DRM_MODE_CONNECTOR_eDP) > > - > > amdgpu_dm_connector_add_common_modes(encoder, connector); > > + amdgpu_dm_connector_add_common_modes(encoder, > > connector); > > amdgpu_dm_connector_add_freesync_modes(connector, > > edid); > > } > > amdgpu_dm_fbc_init(connector); > > -- > > 2.25.1
