Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3de1b81 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'topic/drm-fixes-2016-04-07' of git://anongit.freedesktop.org/drm-intel into drm-fixes 

The qxl fix I've picked up quite some time ago, and unfortunately
neglected.

Then there's established timing fixes, of which particularly "drm/edid:
Fix parsing of EDID 1.4 Established Timings III descriptor" is quite
surprising. It looks like we've never got any of them right. I am not
sure what the full implications of this are. That combined with lack of
any details of real world bugs fixed made me decide against cc: stable.

* tag 'topic/drm-fixes-2016-04-07' of git://anongit.freedesktop.org/drm-intel:
  drm/edid: Fix DMT 1024x768@43Hz (interlaced) timings
  drm/edid: Fix parsing of EDID 1.4 Established Timings III descriptor
  drm/edid: Fix EDID Established Timings I and II
  drm/qxl: fix cursor position with non-zero hotspot
parents bf162006 735b100f

drivers/gpu/drm/drm_edid.c

+5 −5
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static const struct drm_display_mode drm_dmt_modes[] = { 
		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },

	/* 0x0f - 1024x768@43Hz, interlace */

	{ DRM_MODE("1024x768i", DRM_MODE_TYPE_DRIVER, 44900, 1024, 1032,

		   1208, 1264, 0, 768, 768, 772, 817, 0,

		   1208, 1264, 0, 768, 768, 776, 817, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |

		   DRM_MODE_FLAG_INTERLACE) },

	/* 0x10 - 1024x768@60Hz */
@@ -522,12 +522,12 @@ static const struct drm_display_mode edid_est_modes[] = { 
		   720, 840, 0, 480, 481, 484, 500, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, /* 640x480@75Hz */

	{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 31500, 640, 664,

		   704,  832, 0, 480, 489, 491, 520, 0,

		   704,  832, 0, 480, 489, 492, 520, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, /* 640x480@72Hz */

	{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 30240, 640, 704,

		   768,  864, 0, 480, 483, 486, 525, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, /* 640x480@67Hz */

	{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 25200, 640, 656,

	{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 25175, 640, 656,

		   752, 800, 0, 480, 490, 492, 525, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, /* 640x480@60Hz */

	{ DRM_MODE("720x400", DRM_MODE_TYPE_DRIVER, 35500, 720, 738,
@@ -539,7 +539,7 @@ static const struct drm_display_mode edid_est_modes[] = { 
	{ DRM_MODE("1280x1024", DRM_MODE_TYPE_DRIVER, 135000, 1280, 1296,

		   1440, 1688, 0, 1024, 1025, 1028, 1066, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, /* 1280x1024@75Hz */

	{ DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 78800, 1024, 1040,

	{ DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 78750, 1024, 1040,

		   1136, 1312, 0,  768, 769, 772, 800, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, /* 1024x768@75Hz */

	{ DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 75000, 1024, 1048,
@@ -2241,7 +2241,7 @@ drm_est3_modes(struct drm_connector *connector, struct detailed_timing *timing) 
{

	int i, j, m, modes = 0;

	struct drm_display_mode *mode;

	u8 *est = ((u8 *)timing) + 5;

	u8 *est = ((u8 *)timing) + 6;



	for (i = 0; i < 6; i++) {

		for (j = 7; j >= 0; j--) {

drivers/gpu/drm/qxl/qxl_display.c

+9 −4
Original line number Diff line number Diff line
@@ -375,10 +375,15 @@ static int qxl_crtc_cursor_set2(struct drm_crtc *crtc, 


	qxl_bo_kunmap(user_bo);



	qcrtc->cur_x += qcrtc->hot_spot_x - hot_x;

	qcrtc->cur_y += qcrtc->hot_spot_y - hot_y;

	qcrtc->hot_spot_x = hot_x;

	qcrtc->hot_spot_y = hot_y;



	cmd = (struct qxl_cursor_cmd *)qxl_release_map(qdev, release);

	cmd->type = QXL_CURSOR_SET;

	cmd->u.set.position.x = qcrtc->cur_x;

	cmd->u.set.position.y = qcrtc->cur_y;

	cmd->u.set.position.x = qcrtc->cur_x + qcrtc->hot_spot_x;

	cmd->u.set.position.y = qcrtc->cur_y + qcrtc->hot_spot_y;



	cmd->u.set.shape = qxl_bo_physical_address(qdev, cursor_bo, 0);
@@ -441,8 +446,8 @@ static int qxl_crtc_cursor_move(struct drm_crtc *crtc, 


	cmd = (struct qxl_cursor_cmd *)qxl_release_map(qdev, release);

	cmd->type = QXL_CURSOR_MOVE;

	cmd->u.position.x = qcrtc->cur_x;

	cmd->u.position.y = qcrtc->cur_y;

	cmd->u.position.x = qcrtc->cur_x + qcrtc->hot_spot_x;

	cmd->u.position.y = qcrtc->cur_y + qcrtc->hot_spot_y;

	qxl_release_unmap(qdev, release, &cmd->release_info);



	qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);

drivers/gpu/drm/qxl/qxl_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -135,6 +135,8 @@ struct qxl_crtc { 
	int index;

	int cur_x;

	int cur_y;

	int hot_spot_x;

	int hot_spot_y;

};



struct qxl_output {