Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'drm-misc-next-fixes-2020-05-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

Short summary of fixes pull (less than what git shortlog provides):

There's a fix for panel brighness on Lenovo X13 Yoga devices and a fix for
-Wformat warnings on architectures where atomic-64 counters are not of
type unsigned long long.

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200527080123.GA8186@linux-uq9g

+3 -2
+1
drivers/gpu/drm/drm_dp_helper.c
··· 1315 1315 { MFG(0x06, 0xaf), PROD_ID(0xeb, 0x41), BIT(DP_QUIRK_FORCE_DPCD_BACKLIGHT) }, 1316 1316 { MFG(0x4d, 0x10), PROD_ID(0xc7, 0x14), BIT(DP_QUIRK_FORCE_DPCD_BACKLIGHT) }, 1317 1317 { MFG(0x4d, 0x10), PROD_ID(0xe6, 0x14), BIT(DP_QUIRK_FORCE_DPCD_BACKLIGHT) }, 1318 + { MFG(0x4c, 0x83), PROD_ID(0x47, 0x41), BIT(DP_QUIRK_FORCE_DPCD_BACKLIGHT) }, 1318 1319 }; 1319 1320 1320 1321 #undef MFG
+2 -2
drivers/gpu/drm/drm_vblank.c
··· 342 342 343 343 DRM_DEBUG_VBL("updating vblank count on crtc %u:" 344 344 " current=%llu, diff=%u, hw=%u hw_last=%u\n", 345 - pipe, atomic64_read(&vblank->count), diff, 346 - cur_vblank, vblank->last); 345 + pipe, (unsigned long long)atomic64_read(&vblank->count), 346 + diff, cur_vblank, vblank->last); 347 347 348 348 if (diff == 0) { 349 349 WARN_ON_ONCE(cur_vblank != vblank->last);