Commit 5afeb97a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2020-05-27' of... 

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: default avatarDave Airlie <airlied@redhat.com>

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

drivers/gpu/drm/drm_dp_helper.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -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(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(0xc7, 0x14), BIT(DP_QUIRK_FORCE_DPCD_BACKLIGHT) },

	{ MFG(0x4d, 0x10), PROD_ID(0xe6, 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

#undef MFG

drivers/gpu/drm/drm_vblank.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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:"

	DRM_DEBUG_VBL("updating vblank count on crtc %u:"

		      " current=%llu, diff=%u, hw=%u hw_last=%u\n",

		      " current=%llu, diff=%u, hw=%u hw_last=%u\n",

		      pipe, atomic64_read(&vblank->count), diff,

		      pipe, (unsigned long long)atomic64_read(&vblank->count),

		      cur_vblank, vblank->last);

		      diff, cur_vblank, vblank->last);





	if (diff == 0) {

	if (diff == 0) {

		WARN_ON_ONCE(cur_vblank != vblank->last);

		WARN_ON_ONCE(cur_vblank != vblank->last);

CRA Git | Maintained and supported by SUSTech CRA and CCSE