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

Commit 65f0505b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "A few regression fixes already, one for my own stupidity, and mgag200
  typo fix, vmwgfx fixes and ttm regression fixes, and a radeon register
  checker update for older cards to handle geom shaders"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: allow geom rings to be setup on r600/r700 (v2)
  drm/mgag200,ast,cirrus: fix regression with drm_can_sleep conversion
  drm/ttm: Don't clear page metadata of imported sg pages
  drm/ttm: Fix TTM object open regression
  vmwgfx: Fix unitialized stack read in vmw_setup_otable_base
  drm/vmwgfx: Reemit context bindings when necessary v2
  drm/vmwgfx: Detect old user-space drivers and set up legacy emulation v2
  drm/vmwgfx: Emulate legacy shaders on guest-backed devices v2
  drm/vmwgfx: Fix legacy surface reference size copyback
  drm/vmwgfx: Fix SET_SHADER_CONST emulation on guest-backed devices
  drm/vmwgfx: Fix regression caused by "drm/ttm: make ttm reservation calls behave like reservation calls"
  drm/vmwgfx: Don't commit staged bindings if execbuf fails
  drm/mgag200: fix typo causing bw limits to be ignored on some chips
parents ef42c58a 7c4c62a0

drivers/gpu/drm/ast/ast_fb.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static void ast_dirty_update(struct ast_fbdev *afbdev, 
	 * then the BO is being moved and we should

	 * store up the damage until later.

	 */

	if (!drm_can_sleep())

	if (drm_can_sleep())

		ret = ast_bo_reserve(bo, true);

	if (ret) {

		if (ret != -EBUSY)

drivers/gpu/drm/cirrus/cirrus_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static void cirrus_dirty_update(struct cirrus_fbdev *afbdev, 
	 * then the BO is being moved and we should

	 * store up the damage until later.

	 */

	if (!drm_can_sleep())

	if (drm_can_sleep())

		ret = cirrus_bo_reserve(bo, true);

	if (ret) {

		if (ret != -EBUSY)

drivers/gpu/drm/mgag200/mgag200_fb.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev, 
	 * then the BO is being moved and we should

	 * store up the damage until later.

	 */

	if (!drm_can_sleep())

	if (drm_can_sleep())

		ret = mgag200_bo_reserve(bo, true);

	if (ret) {

		if (ret != -EBUSY)

drivers/gpu/drm/mgag200/mgag200_mode.c

+2 −2
Original line number Diff line number Diff line
@@ -1519,11 +1519,11 @@ static int mga_vga_mode_valid(struct drm_connector *connector, 
		(mga_vga_calculate_mode_bandwidth(mode, bpp)

			> (32700 * 1024))) {

		return MODE_BANDWIDTH;

	} else if (mode->type == G200_EH &&

	} else if (mdev->type == G200_EH &&

		(mga_vga_calculate_mode_bandwidth(mode, bpp)

			> (37500 * 1024))) {

		return MODE_BANDWIDTH;

	} else if (mode->type == G200_ER &&

	} else if (mdev->type == G200_ER &&

		(mga_vga_calculate_mode_bandwidth(mode,

			bpp) > (55000 * 1024))) {

		return MODE_BANDWIDTH;

drivers/gpu/drm/radeon/r600_cs.c

+16 −2
Original line number Diff line number Diff line
@@ -1007,8 +1007,22 @@ static int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx) 
	case R_008C64_SQ_VSTMP_RING_SIZE:

	case R_0288C8_SQ_GS_VERT_ITEMSIZE:

		/* get value to populate the IB don't remove */

		tmp =radeon_get_ib_value(p, idx);

		ib[idx] = 0;

		/*tmp =radeon_get_ib_value(p, idx);

		  ib[idx] = 0;*/

		break;

	case SQ_ESGS_RING_BASE:

	case SQ_GSVS_RING_BASE:

	case SQ_ESTMP_RING_BASE:

	case SQ_GSTMP_RING_BASE:

	case SQ_PSTMP_RING_BASE:

	case SQ_VSTMP_RING_BASE:

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			dev_warn(p->dev, "bad SET_CONTEXT_REG "

					"0x%04X\n", reg);

			return -EINVAL;

		}

		ib[idx] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff);

		break;

	case SQ_CONFIG:

		track->sq_config = radeon_get_ib_value(p, idx);