leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* drm/ast: Revert 1600x800 with 108MHz PCLK

Browse Source 
* drm/atomic: fix CRTC handling during modeset
  * drm/privacy-screen: Honor acpi=off
  * drm/ttm: build fix for ARCH=um
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEchf7rIzpz2NEoWjlaA3BHVMLeiMFAmHyX8cACgkQaA3BHVML
 eiN2ywgAkE0eagDfPRsDnu8n1YHcJgRahxWIEHpAD1B8BPAgRisZXtTPARsTKypW
 VzOhcSF8w+QvMA+Sr+DrhAfwGceALbGv55hhPXcUF17Ux8DA2a+v9B+jkkfbNIk9
 VivSzx50uekS9S4QnTjvEZYb6A3/FEVcIvGmjiMS93+W+T0v0QYuY/v6wGtfTbUJ
 MawHkcBwrIUF9g5ZEpwDZ9mr0lfEtxr3cwqfdRSBuq/f5weLKzGzFHLP4d8qC0gf
 59EvY+wpNgZ1o//xhzp+s0VimEu3JDYidtTbS9Ke9JQAjo4j0thD766Os8TreOyn
 BAxrI4WHNIVO2+6rKXmNtPG/5RIAjQ==
 =oqv5
 -----END PGP SIGNATURE-----

Merge tag 'drm-misc-fixes-2022-01-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

 * drm/ast: Revert 1600x800 with 108MHz PCLK
 * drm/atomic: fix CRTC handling during modeset
 * drm/privacy-screen: Honor acpi=off
 * drm/ttm: build fix for ARCH=um

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YfJgH9fz+oo7YSXd@linux-uq9g.fritz.box
This commit is contained in:
Dave Airlie 2022-01-28 14:46:11 +10:00
commit 2fd0e5fb4b
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/ast/ast_tables.h
View File

@ -282,8 +282,6 @@ static const struct ast_vbios_enhtable res_1360x768[] = {
};
static const struct ast_vbios_enhtable res_1600x900[] = {
{1800, 1600, 24, 80, 1000, 900, 1, 3, VCLK108, /* 60Hz */
(SyncPP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 3, 0x3A },
{1760, 1600, 48, 32, 926, 900, 3, 5, VCLK97_75, /* 60Hz CVT RB */
(SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo |
AST2500PreCatchCRT), 60, 1, 0x3A },

12
drivers/gpu/drm/drm_atomic.c
View File

@ -1327,8 +1327,10 @@ int drm_atomic_check_only(struct drm_atomic_state *state)
drm_dbg_atomic(dev, "checking %p\n", state);
for_each_new_crtc_in_state(state, crtc, new_crtc_state, i)
requested_crtc |= drm_crtc_mask(crtc);
for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
if (new_crtc_state->enable)
requested_crtc |= drm_crtc_mask(crtc);
}
for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {
ret = drm_atomic_plane_check(old_plane_state, new_plane_state);
@ -1377,8 +1379,10 @@ int drm_atomic_check_only(struct drm_atomic_state *state)
}
}
for_each_new_crtc_in_state(state, crtc, new_crtc_state, i)
affected_crtc |= drm_crtc_mask(crtc);
for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
if (new_crtc_state->enable)
affected_crtc |= drm_crtc_mask(crtc);
}
/*
* For commits that allow modesets drivers can add other CRTCs to the

3
drivers/gpu/drm/drm_privacy_screen_x86.c
View File

@ -33,6 +33,9 @@ static bool __init detect_thinkpad_privacy_screen(void)
unsigned long long output;
acpi_status status;
if (acpi_disabled)
return false;
/* Get embedded-controller handle */
status = acpi_get_devices("PNP0C09", acpi_set_handle, NULL, &ec_handle);
if (ACPI_FAILURE(status) || !ec_handle)