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

Commit 8cb3ed17 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm: Remove duplicate "return" statement
  drm/nv04/crtc: Bail out if FB is not bound to crtc
  drm/nouveau: fix nv04_sgdma_bind on non-"4kB pages" archs
  drm/nouveau: properly handle allocation failure in nouveau_sgdma_populate
  drm/nouveau: fix oops on pre-semaphore hardware
  drm/nv50/crtc: Bail out if FB is not bound to crtc
  drm/radeon/kms: fix DP detect and EDID fetch for DP bridges
parents 4c752782 55a01f6f

drivers/gpu/drm/drm_fb_helper.c

+0 −1
Original line number Diff line number Diff line
@@ -256,7 +256,6 @@ int drm_fb_helper_panic(struct notifier_block *n, unsigned long ununsed, 
{

	printk(KERN_ERR "panic occurred, switching back to text console\n");

	return drm_fb_helper_force_kernel_mode();

	return 0;

}

EXPORT_SYMBOL(drm_fb_helper_panic);

drivers/gpu/drm/nouveau/nouveau_fence.c

+2 −1
Original line number Diff line number Diff line
@@ -530,7 +530,8 @@ nouveau_fence_channel_init(struct nouveau_channel *chan) 
		nouveau_gpuobj_ref(NULL, &obj);

		if (ret)

			return ret;

	} else {

	} else

	if (USE_SEMA(dev)) {

		/* map fence bo into channel's vm */

		ret = nouveau_bo_vma_add(dev_priv->fence.bo, chan->vm,

					 &chan->fence.vma);

drivers/gpu/drm/nouveau/nouveau_sgdma.c

+5 −2
Original line number Diff line number Diff line
@@ -37,8 +37,11 @@ nouveau_sgdma_populate(struct ttm_backend *be, unsigned long num_pages, 
		return -ENOMEM;



	nvbe->ttm_alloced = kmalloc(sizeof(bool) * num_pages, GFP_KERNEL);

	if (!nvbe->ttm_alloced)

	if (!nvbe->ttm_alloced) {

		kfree(nvbe->pages);

		nvbe->pages = NULL;

		return -ENOMEM;

	}



	nvbe->nr_pages = 0;

	while (num_pages--) {
@@ -126,7 +129,7 @@ nv04_sgdma_bind(struct ttm_backend *be, struct ttm_mem_reg *mem) 


		for (j = 0; j < PAGE_SIZE / NV_CTXDMA_PAGE_SIZE; j++, pte++) {

			nv_wo32(gpuobj, (pte * 4) + 0, offset_l | 3);

			dma_offset += NV_CTXDMA_PAGE_SIZE;

			offset_l += NV_CTXDMA_PAGE_SIZE;

		}

	}

drivers/gpu/drm/nouveau/nv04_crtc.c

+13 −2
Original line number Diff line number Diff line
@@ -781,11 +781,20 @@ nv04_crtc_do_mode_set_base(struct drm_crtc *crtc, 
	struct drm_device *dev = crtc->dev;

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct nv04_crtc_reg *regp = &dev_priv->mode_reg.crtc_reg[nv_crtc->index];

	struct drm_framebuffer *drm_fb = nv_crtc->base.fb;

	struct nouveau_framebuffer *fb = nouveau_framebuffer(drm_fb);

	struct drm_framebuffer *drm_fb;

	struct nouveau_framebuffer *fb;

	int arb_burst, arb_lwm;

	int ret;



	NV_DEBUG_KMS(dev, "index %d\n", nv_crtc->index);



	/* no fb bound */

	if (!atomic && !crtc->fb) {

		NV_DEBUG_KMS(dev, "No FB bound\n");

		return 0;

	}





	/* If atomic, we want to switch to the fb we were passed, so

	 * now we update pointers to do that.  (We don't pin; just

	 * assume we're already pinned and update the base address.)
@@ -794,6 +803,8 @@ nv04_crtc_do_mode_set_base(struct drm_crtc *crtc, 
		drm_fb = passed_fb;

		fb = nouveau_framebuffer(passed_fb);

	} else {

		drm_fb = crtc->fb;

		fb = nouveau_framebuffer(crtc->fb);

		/* If not atomic, we can go ahead and pin, and unpin the

		 * old fb we were passed.

		 */

drivers/gpu/drm/nouveau/nv50_crtc.c

+10 −2
Original line number Diff line number Diff line
@@ -519,12 +519,18 @@ nv50_crtc_do_mode_set_base(struct drm_crtc *crtc, 
	struct drm_device *dev = nv_crtc->base.dev;

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct nouveau_channel *evo = nv50_display(dev)->master;

	struct drm_framebuffer *drm_fb = nv_crtc->base.fb;

	struct nouveau_framebuffer *fb = nouveau_framebuffer(drm_fb);

	struct drm_framebuffer *drm_fb;

	struct nouveau_framebuffer *fb;

	int ret;



	NV_DEBUG_KMS(dev, "index %d\n", nv_crtc->index);



	/* no fb bound */

	if (!atomic && !crtc->fb) {

		NV_DEBUG_KMS(dev, "No FB bound\n");

		return 0;

	}



	/* If atomic, we want to switch to the fb we were passed, so

	 * now we update pointers to do that.  (We don't pin; just

	 * assume we're already pinned and update the base address.)
@@ -533,6 +539,8 @@ nv50_crtc_do_mode_set_base(struct drm_crtc *crtc, 
		drm_fb = passed_fb;

		fb = nouveau_framebuffer(passed_fb);

	} else {

		drm_fb = crtc->fb;

		fb = nouveau_framebuffer(crtc->fb);

		/* If not atomic, we can go ahead and pin, and unpin the

		 * old fb we were passed.

		 */