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

Commit 6ddf37da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm fixes from Dave Airlie:
 "Nothing too crazy in here: a bunch of AMD fixes/quirks, two msm fixes,
  some rockchip fixes, and a udl warning fix, along with one locking fix
  for displayport that seems to fix some dodgy monitors"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/udl: Use unlocked gem unreferencing
  drm/dp: move hw_mutex up the call stack
  drm/amdgpu: Don't move pinned BOs
  drm/radeon: Don't move pinned BOs
  drm/radeon: add a dpm quirk for all R7 370 parts
  drm/radeon: add another R7 370 quirk
  drm/rockchip: dw_hdmi: Don't call platform_set_drvdata()
  drm/rockchip: vop: Fix vop crtc cleanup
  drm/rockchip: dw_hdmi: Call drm_encoder_cleanup() in error path
  drm/rockchip: vop: Disable planes when disabling CRTC
  drm/rockchip: vop: Don't reject empty modesets
  drm/rockchip: cancel pending vblanks on close
  drm/rockchip: vop: fix crtc size in plane check
  drm/radeon: add a dpm quirk for sapphire Dual-X R7 370 2G D5
  drm/amd: Beef up ACP Kconfig menu text
  drm/msm: fix typo in the !COMMON_CLK case
  drm/msm: fix bug after preclose removal
parents 52bef0cb 72b9ff06

drivers/gpu/drm/amd/acp/Kconfig

+6 −2
Original line number Diff line number Diff line 
menu "ACP Configuration"

menu "ACP (Audio CoProcessor) Configuration"



config DRM_AMD_ACP

       bool "Enable ACP IP support"

       bool "Enable AMD Audio CoProcessor IP support"

       select MFD_CORE

       select PM_GENERIC_DOMAINS if PM

       help

	Choose this option to enable ACP IP support for AMD SOCs.

	This adds the ACP (Audio CoProcessor) IP driver and wires

	it up into the amdgpu driver.  The ACP block provides the DMA

	engine for the i2s-based ALSA driver. It is required for audio

	on APUs which utilize an i2s codec.



endmenu

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

+4 −0
Original line number Diff line number Diff line
@@ -608,6 +608,10 @@ int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo) 
	if ((offset + size) <= adev->mc.visible_vram_size)

		return 0;



	/* Can't move a pinned BO to visible VRAM */

	if (abo->pin_count > 0)

		return -EINVAL;



	/* hurrah the memory is not visible ! */

	amdgpu_ttm_placement_from_domain(abo, AMDGPU_GEM_DOMAIN_VRAM);

	lpfn =	adev->mc.visible_vram_size >> PAGE_SHIFT;

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

+6 −0
Original line number Diff line number Diff line
@@ -384,9 +384,15 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, 
			struct ttm_mem_reg *new_mem)

{

	struct amdgpu_device *adev;

	struct amdgpu_bo *abo;

	struct ttm_mem_reg *old_mem = &bo->mem;

	int r;



	/* Can't move a pinned BO */

	abo = container_of(bo, struct amdgpu_bo, tbo);

	if (WARN_ON_ONCE(abo->pin_count > 0))

		return -EINVAL;



	adev = amdgpu_get_adev(bo->bdev);

	if (old_mem->mem_type == TTM_PL_SYSTEM && bo->ttm == NULL) {

		amdgpu_move_null(bo, new_mem);

drivers/gpu/drm/drm_dp_helper.c

+17 −10
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request, 
{

	struct drm_dp_aux_msg msg;

	unsigned int retry;

	int err;

	int err = 0;



	memset(&msg, 0, sizeof(msg));

	msg.address = offset;
@@ -187,6 +187,8 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request, 
	msg.buffer = buffer;

	msg.size = size;



	mutex_lock(&aux->hw_mutex);



	/*

	 * The specification doesn't give any recommendation on how often to

	 * retry native transactions. We used to retry 7 times like for
@@ -195,25 +197,24 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request, 
	 */

	for (retry = 0; retry < 32; retry++) {



		mutex_lock(&aux->hw_mutex);

		err = aux->transfer(aux, &msg);

		mutex_unlock(&aux->hw_mutex);

		if (err < 0) {

			if (err == -EBUSY)

				continue;



			return err;

			goto unlock;

		}





		switch (msg.reply & DP_AUX_NATIVE_REPLY_MASK) {

		case DP_AUX_NATIVE_REPLY_ACK:

			if (err < size)

				return -EPROTO;

			return err;

				err = -EPROTO;

			goto unlock;



		case DP_AUX_NATIVE_REPLY_NACK:

			return -EIO;

			err = -EIO;

			goto unlock;



		case DP_AUX_NATIVE_REPLY_DEFER:

			usleep_range(AUX_RETRY_INTERVAL, AUX_RETRY_INTERVAL + 100);
@@ -222,7 +223,11 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request, 
	}



	DRM_DEBUG_KMS("too many retries, giving up\n");

	return -EIO;

	err = -EIO;



unlock:

	mutex_unlock(&aux->hw_mutex);

	return err;

}



/**
@@ -544,9 +549,7 @@ static int drm_dp_i2c_do_msg(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) 
	int max_retries = max(7, drm_dp_i2c_retry_count(msg, dp_aux_i2c_speed_khz));



	for (retry = 0, defer_i2c = 0; retry < (max_retries + defer_i2c); retry++) {

		mutex_lock(&aux->hw_mutex);

		ret = aux->transfer(aux, msg);

		mutex_unlock(&aux->hw_mutex);

		if (ret < 0) {

			if (ret == -EBUSY)

				continue;
@@ -685,6 +688,8 @@ static int drm_dp_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, 


	memset(&msg, 0, sizeof(msg));



	mutex_lock(&aux->hw_mutex);



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

		msg.address = msgs[i].addr;

		drm_dp_i2c_msg_set_request(&msg, &msgs[i]);
@@ -739,6 +744,8 @@ static int drm_dp_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, 
	msg.size = 0;

	(void)drm_dp_i2c_do_msg(aux, &msg);



	mutex_unlock(&aux->hw_mutex);



	return err;

}

drivers/gpu/drm/msm/hdmi/hdmi.h

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ void __exit msm_hdmi_phy_driver_unregister(void); 
int msm_hdmi_pll_8960_init(struct platform_device *pdev);

int msm_hdmi_pll_8996_init(struct platform_device *pdev);

#else

static inline int msm_hdmi_pll_8960_init(struct platform_device *pdev);

static inline int msm_hdmi_pll_8960_init(struct platform_device *pdev)

{

	return -ENODEV;

}