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

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

Merge tag 'drm-misc-fixes-2018-02-21' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 

Fixes for 4.16. I contains fixes for deadlock on runtime suspend on few
drivers, a memory leak on non-blocking commits, a crash on color-eviction.
The is also meson and edid fixes, plus a fix for a doc warning.

* tag 'drm-misc-fixes-2018-02-21' of git://anongit.freedesktop.org/drm/drm-misc:
  drm/tve200: fix kernel-doc documentation comment include
  drm/meson: fix vsync buffer update
  drm: Handle unexpected holes in color-eviction
  drm/edid: Add 6 bpc quirk for CPT panel in Asus UX303LA
  drm/amdgpu: Fix deadlock on runtime suspend
  drm/radeon: Fix deadlock on runtime suspend
  drm/nouveau: Fix deadlock on runtime suspend
  drm: Allow determining if current task is output poll worker
  workqueue: Allow retrieval of current task's work struct
  drm/atomic: Fix memleak on ERESTARTSYS during non-blocking commits
parents ccffc9eb 30a3317d

Documentation/gpu/tve200.rst

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ 
==================================



.. kernel-doc:: drivers/gpu/drm/tve200/tve200_drv.c

   :doc: Faraday TV Encoder 200
 
   :doc: Faraday TV Encoder TVE200 DRM Driver

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

+38 −20
Original line number Diff line number Diff line
@@ -736,9 +736,11 @@ amdgpu_connector_lvds_detect(struct drm_connector *connector, bool force) 
	enum drm_connector_status ret = connector_status_disconnected;

	int r;



	if (!drm_kms_helper_is_poll_worker()) {

		r = pm_runtime_get_sync(connector->dev->dev);

		if (r < 0)

			return connector_status_disconnected;

	}



	if (encoder) {

		struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder);
@@ -757,8 +759,12 @@ amdgpu_connector_lvds_detect(struct drm_connector *connector, bool force) 
	/* check acpi lid status ??? */



	amdgpu_connector_update_scratch_regs(connector, ret);



	if (!drm_kms_helper_is_poll_worker()) {

		pm_runtime_mark_last_busy(connector->dev->dev);

		pm_runtime_put_autosuspend(connector->dev->dev);

	}



	return ret;

}
@@ -868,9 +874,11 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force) 
	enum drm_connector_status ret = connector_status_disconnected;

	int r;



	if (!drm_kms_helper_is_poll_worker()) {

		r = pm_runtime_get_sync(connector->dev->dev);

		if (r < 0)

			return connector_status_disconnected;

	}



	encoder = amdgpu_connector_best_single_encoder(connector);

	if (!encoder)
@@ -924,8 +932,10 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force) 
	amdgpu_connector_update_scratch_regs(connector, ret);



out:

	if (!drm_kms_helper_is_poll_worker()) {

		pm_runtime_mark_last_busy(connector->dev->dev);

		pm_runtime_put_autosuspend(connector->dev->dev);

	}



	return ret;

}
@@ -988,9 +998,11 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force) 
	enum drm_connector_status ret = connector_status_disconnected;

	bool dret = false, broken_edid = false;



	if (!drm_kms_helper_is_poll_worker()) {

		r = pm_runtime_get_sync(connector->dev->dev);

		if (r < 0)

			return connector_status_disconnected;

	}



	if (!force && amdgpu_connector_check_hpd_status_unchanged(connector)) {

		ret = connector->status;
@@ -1115,8 +1127,10 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force) 
	amdgpu_connector_update_scratch_regs(connector, ret);



exit:

	if (!drm_kms_helper_is_poll_worker()) {

		pm_runtime_mark_last_busy(connector->dev->dev);

		pm_runtime_put_autosuspend(connector->dev->dev);

	}



	return ret;

}
@@ -1359,9 +1373,11 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force) 
	struct drm_encoder *encoder = amdgpu_connector_best_single_encoder(connector);

	int r;



	if (!drm_kms_helper_is_poll_worker()) {

		r = pm_runtime_get_sync(connector->dev->dev);

		if (r < 0)

			return connector_status_disconnected;

	}



	if (!force && amdgpu_connector_check_hpd_status_unchanged(connector)) {

		ret = connector->status;
@@ -1429,8 +1445,10 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force) 


	amdgpu_connector_update_scratch_regs(connector, ret);

out:

	if (!drm_kms_helper_is_poll_worker()) {

		pm_runtime_mark_last_busy(connector->dev->dev);

		pm_runtime_put_autosuspend(connector->dev->dev);

	}



	return ret;

}

drivers/gpu/drm/drm_atomic_helper.c

+15 −0
Original line number Diff line number Diff line
@@ -1878,6 +1878,8 @@ int drm_atomic_helper_setup_commit(struct drm_atomic_state *state, 
		new_crtc_state->event->base.completion = &commit->flip_done;

		new_crtc_state->event->base.completion_release = release_crtc_commit;

		drm_crtc_commit_get(commit);



		commit->abort_completion = true;

	}



	for_each_oldnew_connector_in_state(state, conn, old_conn_state, new_conn_state, i) {
@@ -3421,8 +3423,21 @@ EXPORT_SYMBOL(drm_atomic_helper_crtc_duplicate_state); 
void __drm_atomic_helper_crtc_destroy_state(struct drm_crtc_state *state)

{

	if (state->commit) {

		/*

		 * In the event that a non-blocking commit returns

		 * -ERESTARTSYS before the commit_tail work is queued, we will

		 * have an extra reference to the commit object. Release it, if

		 * the event has not been consumed by the worker.

		 *

		 * state->event may be freed, so we can't directly look at

		 * state->event->base.completion.

		 */

		if (state->event && state->commit->abort_completion)

			drm_crtc_commit_put(state->commit);



		kfree(state->commit->event);

		state->commit->event = NULL;



		drm_crtc_commit_put(state->commit);

	}

drivers/gpu/drm/drm_edid.c

+3 −0
Original line number Diff line number Diff line
@@ -113,6 +113,9 @@ static const struct edid_quirk { 
	/* AEO model 0 reports 8 bpc, but is a 6 bpc panel */

	{ "AEO", 0, EDID_QUIRK_FORCE_6BPC },



	/* CPT panel of Asus UX303LA reports 8 bpc, but is a 6 bpc panel */

	{ "CPT", 0x17df, EDID_QUIRK_FORCE_6BPC },



	/* Belinea 10 15 55 */

	{ "MAX", 1516, EDID_QUIRK_PREFER_LARGE_60 },

	{ "MAX", 0x77e, EDID_QUIRK_PREFER_LARGE_60 },

drivers/gpu/drm/drm_mm.c

+18 −3
Original line number Diff line number Diff line
@@ -836,10 +836,25 @@ struct drm_mm_node *drm_mm_scan_color_evict(struct drm_mm_scan *scan) 
	if (!mm->color_adjust)

		return NULL;



	hole = list_first_entry(&mm->hole_stack, typeof(*hole), hole_stack);

	/*

	 * The hole found during scanning should ideally be the first element

	 * in the hole_stack list, but due to side-effects in the driver it

	 * may not be.

	 */

	list_for_each_entry(hole, &mm->hole_stack, hole_stack) {

		hole_start = __drm_mm_hole_node_start(hole);

		hole_end = hole_start + hole->hole_size;



		if (hole_start <= scan->hit_start &&

		    hole_end >= scan->hit_end)

			break;

	}



	/* We should only be called after we found the hole previously */

	DRM_MM_BUG_ON(&hole->hole_stack == &mm->hole_stack);

	if (unlikely(&hole->hole_stack == &mm->hole_stack))

		return NULL;



	DRM_MM_BUG_ON(hole_start > scan->hit_start);

	DRM_MM_BUG_ON(hole_end < scan->hit_end);