Commit 8961ca44 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-for-v4.16-rc3' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "A bunch of fixes for rc3:

  Exynos:
   - fixes for using monotonic timestamps
   - register definitions
   - removal of unused file

  ipu-v3L
   - minor changes
   - make some register arrays const+static
   - fix some leaks

  meson:
   - fix for vsync

  atomic:
   - fix for memory leak

  EDID parser:
   - add quirks for some more non-desktop devices
   - 6-bit panel fix.

  drm_mm:
   - fix a bug in the core drm mm hole handling

  cirrus:
   - fix lut loading regression

  Lastly there is a deadlock fix around runtime suspend for secondary
  GPUs.

  There was a deadlock between one thread trying to wait for a workqueue
  job to finish in the runtime suspend path, and the workqueue job it
  was waiting for in turn waiting for a runtime_get_sync to return.

  The fixes avoids it by not doing the runtime sync in the workqueue as
  then we always wait for all those tasks to complete before we runtime
  suspend"

* tag 'drm-fixes-for-v4.16-rc3' of git://people.freedesktop.org/~airlied/linux: (25 commits)
  drm/tve200: fix kernel-doc documentation comment include
  drm/edid: quirk Sony PlayStation VR headset as non-desktop
  drm/edid: quirk Windows Mixed Reality headsets as non-desktop
  drm/edid: quirk Oculus Rift headsets as non-desktop
  drm/meson: fix vsync buffer update
  drm: Handle unexpected holes in color-eviction
  drm: exynos: Use proper macro definition for HDMI_I2S_PIN_SEL_1
  drm/exynos: remove exynos_drm_rotator.h
  drm/exynos: g2d: Delete an error message for a failed memory allocation in two functions
  drm/exynos: fix comparison to bitshift when dealing with a mask
  drm/exynos: g2d: use monotonic timestamps
  drm/edid: Add 6 bpc quirk for CPT panel in Asus UX303LA
  gpu: ipu-csi: add 10/12-bit grayscale support to mbus_code_to_bus_cfg
  gpu: ipu-cpmem: add 16-bit grayscale support to ipu_cpmem_set_image
  gpu: ipu-v3: prg: fix device node leak in ipu_prg_lookup_by_phandle
  gpu: ipu-v3: pre: fix device node leak in ipu_pre_lookup_by_phandle
  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
  ...
parents 0f9da844 b17800e9

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 @@ out: 
	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/cirrus/cirrus_mode.c

+23 −17
Original line number Diff line number Diff line
@@ -294,22 +294,7 @@ static void cirrus_crtc_prepare(struct drm_crtc *crtc) 
{

}



/*

 * This is called after a mode is programmed. It should reverse anything done

 * by the prepare function

 */

static void cirrus_crtc_commit(struct drm_crtc *crtc)

{

}



/*

 * The core can pass us a set of gamma values to program. We actually only

 * use this for 8-bit mode so can't perform smooth fades on deeper modes,

 * but it's a requirement that we provide the function

 */

static int cirrus_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,

				 u16 *blue, uint32_t size,

				 struct drm_modeset_acquire_ctx *ctx)

static void cirrus_crtc_load_lut(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	struct cirrus_device *cdev = dev->dev_private;
@@ -317,7 +302,7 @@ static int cirrus_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, 
	int i;



	if (!crtc->enabled)

		return 0;

		return;



	r = crtc->gamma_store;

	g = r + crtc->gamma_size;
@@ -330,6 +315,27 @@ static int cirrus_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, 
		WREG8(PALETTE_DATA, *g++ >> 8);

		WREG8(PALETTE_DATA, *b++ >> 8);

	}

}



/*

 * This is called after a mode is programmed. It should reverse anything done

 * by the prepare function

 */

static void cirrus_crtc_commit(struct drm_crtc *crtc)

{

	cirrus_crtc_load_lut(crtc);

}



/*

 * The core can pass us a set of gamma values to program. We actually only

 * use this for 8-bit mode so can't perform smooth fades on deeper modes,

 * but it's a requirement that we provide the function

 */

static int cirrus_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,

				 u16 *blue, uint32_t size,

				 struct drm_modeset_acquire_ctx *ctx)

{

	cirrus_crtc_load_lut(crtc);



	return 0;

}

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

+21 −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 },
@@ -162,6 +165,24 @@ static const struct edid_quirk { 


	/* HTC Vive VR Headset */

	{ "HVR", 0xaa01, EDID_QUIRK_NON_DESKTOP },



	/* Oculus Rift DK1, DK2, and CV1 VR Headsets */

	{ "OVR", 0x0001, EDID_QUIRK_NON_DESKTOP },

	{ "OVR", 0x0003, EDID_QUIRK_NON_DESKTOP },

	{ "OVR", 0x0004, EDID_QUIRK_NON_DESKTOP },



	/* Windows Mixed Reality Headsets */

	{ "ACR", 0x7fce, EDID_QUIRK_NON_DESKTOP },

	{ "HPN", 0x3515, EDID_QUIRK_NON_DESKTOP },

	{ "LEN", 0x0408, EDID_QUIRK_NON_DESKTOP },

	{ "LEN", 0xb800, EDID_QUIRK_NON_DESKTOP },

	{ "FUJ", 0x1970, EDID_QUIRK_NON_DESKTOP },

	{ "DEL", 0x7fce, EDID_QUIRK_NON_DESKTOP },

	{ "SEC", 0x144a, EDID_QUIRK_NON_DESKTOP },

	{ "AUS", 0xc102, EDID_QUIRK_NON_DESKTOP },



	/* Sony PlayStation VR Headset */

	{ "SNY", 0x0704, EDID_QUIRK_NON_DESKTOP },

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE