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

Commit 0b5477d9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm fixes from Dave Airlie:
 "These iare the fixes for 4.13-rc3: vmwgfx, exynos, i915, amdgpu,
  nouveau, host1x and displayport fixes.

  As expected people woke up this week, i915 didn't do an -rc2 pull so
  got a bumper -rc3 pull, and Ben resurfaced on nouveau and fixed a
  bunch of major crashers seen on Fedora 26, and there are a few vmwgfx
  fixes as well.

  Otherwise exynos had some regression fixes/cleanups, and amdgpu has an
  rcu locking regression fix and a couple of minor fixes"

* tag 'drm-fixes-for-v4.13-rc3' of git://people.freedesktop.org/~airlied/linux: (44 commits)
  drm/i915: Fix bad comparison in skl_compute_plane_wm.
  drm/i915: Force CPU synchronisation even if userspace requests ASYNC
  drm/i915: Only skip updating execobject.offset after error
  drm/i915: Only mark the execobject as pinned on success
  drm/i915: Remove assertion from raw __i915_vma_unpin()
  drm/i915/cnl: Fix loadgen select programming on ddi vswing sequence
  drm/i915: Fix scaler init during CRTC HW state readout
  drm/i915/selftests: Fix an error handling path in 'mock_gem_device()'
  drm/i915: Unbreak gpu reset vs. modeset locking
  gpu: host1x: Free the IOMMU domain when there is no device to attach
  drm/i915: Fix cursor updates on some platforms
  drm/i915: Fix user ptr check size in eb_relocate_vma()
  drm: exynos: mark pm functions as __maybe_unused
  drm/exynos: select CEC_CORE if CEC_NOTIFIER
  drm/exynos/hdmi: fix disable sequence
  drm/exynos: mic: add a bridge at probe
  drm/exynos/dsi: Remove error handling for bridge_node DT parsing
  drm/exynos: dsi: do not try to find bridge
  drm: exynos: hdmi: make of_device_ids const.
  drm: exynos: constify mixer_match_types and *_mxr_drv_data.
  ...
parents 0ce2f385 20806588

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

+7 −3
Original line number Diff line number Diff line
@@ -198,12 +198,16 @@ amdgpu_bo_list_get(struct amdgpu_fpriv *fpriv, int id) 
	result = idr_find(&fpriv->bo_list_handles, id);



	if (result) {

		if (kref_get_unless_zero(&result->refcount))

		if (kref_get_unless_zero(&result->refcount)) {

			rcu_read_unlock();

			mutex_lock(&result->lock);

		else

		} else {

			rcu_read_unlock();

			result = NULL;

		}

	} else {

		rcu_read_unlock();

	}



	return result;

}

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

+13 −11
Original line number Diff line number Diff line
@@ -1475,21 +1475,23 @@ static void gfx_v9_0_tiling_mode_table_init(struct amdgpu_device *adev) 


static void gfx_v9_0_select_se_sh(struct amdgpu_device *adev, u32 se_num, u32 sh_num, u32 instance)

{

	u32 data = REG_SET_FIELD(0, GRBM_GFX_INDEX, INSTANCE_BROADCAST_WRITES, 1);

	u32 data;



	if ((se_num == 0xffffffff) && (sh_num == 0xffffffff)) {

		data = REG_SET_FIELD(data, GRBM_GFX_INDEX, SH_BROADCAST_WRITES, 1);

		data = REG_SET_FIELD(data, GRBM_GFX_INDEX, SE_BROADCAST_WRITES, 1);

	} else if (se_num == 0xffffffff) {

		data = REG_SET_FIELD(data, GRBM_GFX_INDEX, SH_INDEX, sh_num);

	if (instance == 0xffffffff)

		data = REG_SET_FIELD(0, GRBM_GFX_INDEX, INSTANCE_BROADCAST_WRITES, 1);

	else

		data = REG_SET_FIELD(0, GRBM_GFX_INDEX, INSTANCE_INDEX, instance);



	if (se_num == 0xffffffff)

		data = REG_SET_FIELD(data, GRBM_GFX_INDEX, SE_BROADCAST_WRITES, 1);

	} else if (sh_num == 0xffffffff) {

		data = REG_SET_FIELD(data, GRBM_GFX_INDEX, SH_BROADCAST_WRITES, 1);

	else

		data = REG_SET_FIELD(data, GRBM_GFX_INDEX, SE_INDEX, se_num);

	} else {



	if (sh_num == 0xffffffff)

		data = REG_SET_FIELD(data, GRBM_GFX_INDEX, SH_BROADCAST_WRITES, 1);

	else

		data = REG_SET_FIELD(data, GRBM_GFX_INDEX, SH_INDEX, sh_num);

		data = REG_SET_FIELD(data, GRBM_GFX_INDEX, SE_INDEX, se_num);

	}



	WREG32_SOC15(GC, 0, mmGRBM_GFX_INDEX, data);

}

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c

+3 −9
Original line number Diff line number Diff line
@@ -2128,15 +2128,9 @@ static int vega10_populate_avfs_parameters(struct pp_hwmgr *hwmgr) 
			pp_table->AvfsGbCksOff.m2_shift = 12;

			pp_table->AvfsGbCksOff.b_shift = 0;



			for (i = 0; i < dep_table->count; i++) {

				if (dep_table->entries[i].sclk_offset == 0)

					pp_table->StaticVoltageOffsetVid[i] = 248;

				else

			for (i = 0; i < dep_table->count; i++)

				pp_table->StaticVoltageOffsetVid[i] =

						(uint8_t)(dep_table->entries[i].sclk_offset *

								VOLTAGE_VID_OFFSET_SCALE2 /

								VOLTAGE_VID_OFFSET_SCALE1);

			}

						convert_to_vid((uint8_t)(dep_table->entries[i].sclk_offset));



			if ((PPREGKEY_VEGA10QUADRATICEQUATION_DFLT !=

					data->disp_clk_quad_eqn_a) &&

drivers/gpu/drm/drm_dp_helper.c

+3 −2
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ void drm_dp_downstream_debug(struct seq_file *m, 
				 DP_DETAILED_CAP_INFO_AVAILABLE;

	int clk;

	int bpc;

	char id[6];

	char id[7];

	int len;

	uint8_t rev[2];

	int type = port_cap[0] & DP_DS_PORT_TYPE_MASK;
@@ -583,6 +583,7 @@ void drm_dp_downstream_debug(struct seq_file *m, 
		seq_puts(m, "\t\tType: N/A\n");

	}



	memset(id, 0, sizeof(id));

	drm_dp_downstream_id(aux, id);

	seq_printf(m, "\t\tID: %s\n", id);
@@ -591,7 +592,7 @@ void drm_dp_downstream_debug(struct seq_file *m, 
		seq_printf(m, "\t\tHW: %d.%d\n",

			   (rev[0] & 0xf0) >> 4, rev[0] & 0xf);



	len = drm_dp_dpcd_read(aux, DP_BRANCH_SW_REV, &rev, 2);

	len = drm_dp_dpcd_read(aux, DP_BRANCH_SW_REV, rev, 2);

	if (len > 0)

		seq_printf(m, "\t\tSW: %d.%d\n", rev[0], rev[1]);

drivers/gpu/drm/exynos/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ config DRM_EXYNOS_DP 
config DRM_EXYNOS_HDMI

	bool "HDMI"

	depends on DRM_EXYNOS_MIXER || DRM_EXYNOS5433_DECON

	select CEC_CORE if CEC_NOTIFIER

	help

	  Choose this option if you want to use Exynos HDMI for DRM.