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

Commit c39ac49f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm nouveau fixes from Dave Airlie:
 "This is just nouveau fixes from Ben, one fixes a nasty oops that some
  Fedora people have been seeing, so I'd like to get it out of the way."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/nv50: use correct tiling methods for m2mf buffer moves
  drm/nouveau: idle channel before releasing notify object
  drm/nouveau: fix regression in vblanking
  drm/nv50: encoder creation failure doesn't mean full init failure
parents 6d9431a7 8698080e

drivers/gpu/drm/nouveau/core/engine/disp/nv50.c

+2 −2
Original line number Diff line number Diff line
@@ -544,13 +544,13 @@ nv50_disp_curs_ofuncs = { 
static void

nv50_disp_base_vblank_enable(struct nouveau_event *event, int head)

{

	nv_mask(event->priv, 0x61002c, (1 << head), (1 << head));

	nv_mask(event->priv, 0x61002c, (4 << head), (4 << head));

}



static void

nv50_disp_base_vblank_disable(struct nouveau_event *event, int head)

{

	nv_mask(event->priv, 0x61002c, (1 << head), (0 << head));

	nv_mask(event->priv, 0x61002c, (4 << head), 0);

}



static int

drivers/gpu/drm/nouveau/nouveau_abi16.c

+5 −0
Original line number Diff line number Diff line
@@ -116,6 +116,11 @@ nouveau_abi16_chan_fini(struct nouveau_abi16 *abi16, 
{

	struct nouveau_abi16_ntfy *ntfy, *temp;



	/* wait for all activity to stop before releasing notify object, which

	 * may be still in use */

	if (chan->chan && chan->ntfy)

		nouveau_channel_idle(chan->chan);



	/* cleanup notifier state */

	list_for_each_entry_safe(ntfy, temp, &chan->notifiers, head) {

		nouveau_abi16_ntfy_fini(chan, ntfy);

drivers/gpu/drm/nouveau/nouveau_bo.c

+2 −2
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ nv50_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo, 
		stride  = 16 * 4;

		height  = amount / stride;



		if (new_mem->mem_type == TTM_PL_VRAM &&

		if (old_mem->mem_type == TTM_PL_VRAM &&

		    nouveau_bo_tile_layout(nvbo)) {

			ret = RING_SPACE(chan, 8);

			if (ret)
@@ -823,7 +823,7 @@ nv50_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo, 
			BEGIN_NV04(chan, NvSubCopy, 0x0200, 1);

			OUT_RING  (chan, 1);

		}

		if (old_mem->mem_type == TTM_PL_VRAM &&

		if (new_mem->mem_type == TTM_PL_VRAM &&

		    nouveau_bo_tile_layout(nvbo)) {

			ret = RING_SPACE(chan, 8);

			if (ret)

drivers/gpu/drm/nouveau/nv50_display.c

+1 −0
Original line number Diff line number Diff line
@@ -2276,6 +2276,7 @@ nv50_display_create(struct drm_device *dev) 
			NV_WARN(drm, "failed to create encoder %d/%d/%d: %d\n",

				     dcbe->location, dcbe->type,

				     ffs(dcbe->or) - 1, ret);

			ret = 0;

		}

	}