]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
BackMerge tag 'v5.15' into drm-next
authorDave Airlie <airlied@redhat.com>
Thu, 11 Nov 2021 23:22:28 +0000 (09:22 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 11 Nov 2021 23:23:16 +0000 (09:23 +1000)
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 <airlied@redhat.com>
1  2 
MAINTAINERS
drivers/gpu/drm/amd/display/include/dal_asic_id.h
drivers/gpu/drm/drm_panel_orientation_quirks.c
drivers/gpu/drm/i915/display/intel_dp.c
drivers/gpu/drm/ttm/ttm_bo_util.c

diff --cc MAINTAINERS
Simple merge
index 62e8ccc7ab9cbc4f91a779c477125caa9b00f775,e1b2ce4921ae77b7683e2618e1755b5e99ba6113..a9359878f4ed6311d8459278b4ffc170459918cf
@@@ -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"),
Simple merge