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

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

Merge tag 'drm-fixes-for-4.8-rc5' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Contains fixes for imx, amdgpu, vc4, msm and one nouveau ACPI fix"

* tag 'drm-fixes-for-4.8-rc5' of git://people.freedesktop.org/~airlied/linux:
  drm/amdgpu: record error code when ring test failed
  drm/amd/amdgpu: compute ring test fail during S4 on CI
  drm/amd/amdgpu: sdma resume fail during S4 on CI
  drm/nouveau/acpi: use DSM if bridge does not support D3cold
  drm/imx: fix crtc vblank state regression
  drm/imx: Add active plane reconfiguration support
  drm/msm: protect against faults from copy_from_user() in submit ioctl
  drm/msm: fix use of copy_from_user() while holding spinlock
  drm/vc4: Fix oops when userspace hands in a bad BO.
  drm/vc4: Fix overflow mem unreferencing when the binner runs dry.
  drm/vc4: Free hang state before destroying BO cache.
  drm/vc4: Fix handling of a pm_runtime_get_sync() success case.
  drm/vc4: Use drm_malloc_ab to fix large rendering jobs.
  drm/vc4: Use drm_free_large() on handles to match its allocation.
parents cc4163da 603f2c9f

drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c

+3 −2
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ void amdgpu_ib_pool_fini(struct amdgpu_device *adev) 
int amdgpu_ib_ring_tests(struct amdgpu_device *adev)

{

	unsigned i;

	int r;

	int r, ret = 0;



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

		struct amdgpu_ring *ring = adev->rings[i];
@@ -301,10 +301,11 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev) 
			} else {

				/* still not good, but we can live with it */

				DRM_ERROR("amdgpu: failed testing IB on ring %d (%d).\n", i, r);

				ret = r;

			}

		}

	}

	return 0;

	return ret;

}



/*

drivers/gpu/drm/amd/amdgpu/cik_sdma.c

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ static void cik_sdma_set_ring_funcs(struct amdgpu_device *adev); 
static void cik_sdma_set_irq_funcs(struct amdgpu_device *adev);

static void cik_sdma_set_buffer_funcs(struct amdgpu_device *adev);

static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev);

static int cik_sdma_soft_reset(void *handle);



MODULE_FIRMWARE("radeon/bonaire_sdma.bin");

MODULE_FIRMWARE("radeon/bonaire_sdma1.bin");
@@ -1037,6 +1038,8 @@ static int cik_sdma_resume(void *handle) 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	cik_sdma_soft_reset(handle);



	return cik_sdma_hw_init(adev);

}

drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c

+9 −3
Original line number Diff line number Diff line
@@ -2755,8 +2755,7 @@ static int gfx_v7_0_cp_compute_resume(struct amdgpu_device *adev) 
	u64 wb_gpu_addr;

	u32 *buf;

	struct bonaire_mqd *mqd;



	gfx_v7_0_cp_compute_enable(adev, true);

	struct amdgpu_ring *ring;



	/* fix up chicken bits */

	tmp = RREG32(mmCP_CPF_DEBUG);
@@ -2791,7 +2790,7 @@ static int gfx_v7_0_cp_compute_resume(struct amdgpu_device *adev) 


	/* init the queues.  Just two for now. */

	for (i = 0; i < adev->gfx.num_compute_rings; i++) {

		struct amdgpu_ring *ring = &adev->gfx.compute_ring[i];

		ring = &adev->gfx.compute_ring[i];



		if (ring->mqd_obj == NULL) {

			r = amdgpu_bo_create(adev,
@@ -2970,6 +2969,13 @@ static int gfx_v7_0_cp_compute_resume(struct amdgpu_device *adev) 
		amdgpu_bo_unreserve(ring->mqd_obj);



		ring->ready = true;

	}



	gfx_v7_0_cp_compute_enable(adev, true);



	for (i = 0; i < adev->gfx.num_compute_rings; i++) {

		ring = &adev->gfx.compute_ring[i];



		r = amdgpu_ring_test_ring(ring);

		if (r)

			ring->ready = false;

drivers/gpu/drm/imx/imx-drm-core.c

+25 −1
Original line number Diff line number Diff line
@@ -171,10 +171,34 @@ static void imx_drm_output_poll_changed(struct drm_device *drm) 
	drm_fbdev_cma_hotplug_event(imxdrm->fbhelper);

}



static int imx_drm_atomic_check(struct drm_device *dev,

				struct drm_atomic_state *state)

{

	int ret;



	ret = drm_atomic_helper_check_modeset(dev, state);

	if (ret)

		return ret;



	ret = drm_atomic_helper_check_planes(dev, state);

	if (ret)

		return ret;



	/*

	 * Check modeset again in case crtc_state->mode_changed is

	 * updated in plane's ->atomic_check callback.

	 */

	ret = drm_atomic_helper_check_modeset(dev, state);

	if (ret)

		return ret;



	return ret;

}



static const struct drm_mode_config_funcs imx_drm_mode_config_funcs = {

	.fb_create = drm_fb_cma_create,

	.output_poll_changed = imx_drm_output_poll_changed,

	.atomic_check = drm_atomic_helper_check,

	.atomic_check = imx_drm_atomic_check,

	.atomic_commit = drm_atomic_helper_commit,

};

drivers/gpu/drm/imx/ipuv3-crtc.c

+4 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ static void ipu_crtc_disable(struct drm_crtc *crtc) 
		crtc->state->event = NULL;

	}

	spin_unlock_irq(&crtc->dev->event_lock);



	drm_crtc_vblank_off(crtc);

}



static void imx_drm_crtc_reset(struct drm_crtc *crtc)
@@ -175,6 +177,8 @@ static int ipu_crtc_atomic_check(struct drm_crtc *crtc, 
static void ipu_crtc_atomic_begin(struct drm_crtc *crtc,

				  struct drm_crtc_state *old_crtc_state)

{

	drm_crtc_vblank_on(crtc);



	spin_lock_irq(&crtc->dev->event_lock);

	if (crtc->state->event) {

		WARN_ON(drm_crtc_vblank_get(crtc));