mirror of https://gitee.com/openkylin/linux.git
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. -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEchf7rIzpz2NEoWjlaA3BHVMLeiMFAl7OHdgACgkQaA3BHVML eiOhzwgAom+GR5PrDEpLdqdlmBGPgMoefyDlUZMLk22eaPlYaAQxSbyMjBogPu4Q 7Xw1tHTMrErAOMi/SwumoDfGZ/B/WfjzQuBtobAcPZLd5QaV5PioPFgF28yl17oc /ykob8DeyOa9tD8HnZD6ZZKTFCOzwjhqWEW//w523fiwFc965l/BoHDq0i11Ze8g nJ7iDU9eCOmS28Loozbttx0MBDTi/ZXF5LLmioL9N4V+OH+4LMkHXn1ZrQ1TqbBm ZuiRw7dupUAu6PIAAWxjbwmiVBksU8iS+GKwuLQ9He1tjybC2UZXu02uzzgROj/h 00paLMLlmqtp9JkKvapAGGyW65967Q== =ldcO -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
5afeb97a18
|
@ -1315,6 +1315,7 @@ static const struct edid_quirk edid_quirk_list[] = {
|
|||
{ MFG(0x06, 0xaf), PROD_ID(0xeb, 0x41), BIT(DP_QUIRK_FORCE_DPCD_BACKLIGHT) },
|
||||
{ MFG(0x4d, 0x10), PROD_ID(0xc7, 0x14), BIT(DP_QUIRK_FORCE_DPCD_BACKLIGHT) },
|
||||
{ MFG(0x4d, 0x10), PROD_ID(0xe6, 0x14), BIT(DP_QUIRK_FORCE_DPCD_BACKLIGHT) },
|
||||
{ MFG(0x4c, 0x83), PROD_ID(0x47, 0x41), BIT(DP_QUIRK_FORCE_DPCD_BACKLIGHT) },
|
||||
};
|
||||
|
||||
#undef MFG
|
||||
|
|
|
@ -342,8 +342,8 @@ static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe,
|
|||
|
||||
DRM_DEBUG_VBL("updating vblank count on crtc %u:"
|
||||
" current=%llu, diff=%u, hw=%u hw_last=%u\n",
|
||||
pipe, atomic64_read(&vblank->count), diff,
|
||||
cur_vblank, vblank->last);
|
||||
pipe, (unsigned long long)atomic64_read(&vblank->count),
|
||||
diff, cur_vblank, vblank->last);
|
||||
|
||||
if (diff == 0) {
|
||||
WARN_ON_ONCE(cur_vblank != vblank->last);
|
||||
|
|
Loading…
Reference in New Issue