From: Dave Airlie Date: Thu, 11 Nov 2021 23:22:28 +0000 (+1000) Subject: BackMerge tag 'v5.15' into drm-next X-Git-Tag: xarray-5.18~577^2~1 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=447212bb4f8ebd7d95dd6e160cd82c69c9a23c4c;p=users%2Fwilly%2Fxarray.git BackMerge tag 'v5.15' into drm-next I got a drm-fixes which had some 5.15 stuff in it, so to avoid the mess just backmerge here. Linux 5.15 Signed-off-by: Dave Airlie --- 447212bb4f8ebd7d95dd6e160cd82c69c9a23c4c diff --cc drivers/gpu/drm/drm_panel_orientation_quirks.c index 62e8ccc7ab9c,e1b2ce4921ae..a9359878f4ed --- a/drivers/gpu/drm/drm_panel_orientation_quirks.c +++ b/drivers/gpu/drm/drm_panel_orientation_quirks.c @@@ -140,20 -134,12 +140,26 @@@ static const struct dmi_system_id orien DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T103HAF"), }, .driver_data = (void *)&lcd800x1280_rightside_up, + }, { /* AYA NEO 2021 */ + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "AYADEVICE"), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "AYA NEO 2021"), + }, + .driver_data = (void *)&lcd800x1280_rightside_up, + }, { /* Chuwi HiBook (CWI514) */ + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "Hampoo"), + DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"), + /* Above matches are too generic, add bios-date match */ + DMI_MATCH(DMI_BIOS_DATE, "05/07/2016"), + }, + .driver_data = (void *)&lcd1200x1920_rightside_up, + }, { /* Chuwi Hi10 Pro (CWI529) */ + .matches = { + DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "Hampoo"), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Hi10 pro tablet"), + }, + .driver_data = (void *)&lcd1200x1920_rightside_up, }, { /* GPD MicroPC (generic strings, also match on bios date) */ .matches = { DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Default string"),