diff options
| author | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-01-24 13:03:16 +0300 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-01-24 13:03:16 +0300 |
| commit | d2c20b5d37820876a8beea4d8d0bc59147077dd5 (patch) | |
| tree | ae032c4de299cb8f14275514c5cec634bc46b591 /drivers/gpu/drm/drm_dp_helper.c | |
| parent | b30b61ff6b1dc37f276cf56a8328b80086a3ffca (diff) | |
| parent | 8ca4fd0406b41a872055048d694f3702d8eddb76 (diff) | |
| download | linux-d2c20b5d37820876a8beea4d8d0bc59147077dd5.tar.xz | |
Merge drm/drm-next into drm-misc-next
danvet needs a backmerge to ease the upcoming drmP.h rework
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Diffstat (limited to 'drivers/gpu/drm/drm_dp_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_dp_helper.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index d4ecedccbb31..54120b6319e7 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -1277,6 +1277,8 @@ static const struct dpcd_quirk dpcd_quirk_list[] = { { OUI(0x00, 0x22, 0xb9), DEVICE_ID_ANY, true, BIT(DP_DPCD_QUIRK_CONSTANT_N) }, /* LG LP140WF6-SPM1 eDP panel */ { OUI(0x00, 0x22, 0xb9), DEVICE_ID('s', 'i', 'v', 'a', 'r', 'T'), false, BIT(DP_DPCD_QUIRK_CONSTANT_N) }, + /* Apple panels need some additional handling to support PSR */ + { OUI(0x00, 0x10, 0xfa), DEVICE_ID_ANY, false, BIT(DP_DPCD_QUIRK_NO_PSR) } }; #undef OUI |