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

Commit 545aabcb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2019-02-15-1' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Usual pull request, little larger than I'd like but nothing too
  strange in it. Willy found an bug in the lease ioctl calculations, but
  it's a drm master only ioctl which makes it harder to mess with.

 i915:
   - combo phy programming fix
   - opregion version check fix for VBT RVDA lookup
   - gem mmap ioctl race fix
   - fbdev hpd during suspend fix
   - array size bounds check fix in pmu

  amdgpu:
   - Vega20 psp fix
   - Add vrr range to debugfs for freesync debugging

  sched:
   - Scheduler race fix

  vkms:
   - license header fixups

  imx:
   - Fix CSI register offsets for i.MX51 and i.MX53.
   - Fix delayed page flip completion events on i.MX6QP due to
     unexpected behaviour of the PRE when issuing NOP buffer updates to
     the same buffer address.
   - Stop throwing errors for plane updates on disabled CRTCs when a
     userspace process is killed while a plane update is pending.
   - Add missing of_node_put cleanup in imx_ldb_bind"

* tag 'drm-fixes-2019-02-15-1' of git://anongit.freedesktop.org/drm/drm:
  drm: Use array_size() when creating lease
  drm/amdgpu/psp11: TA firmware is optional (v3)
  drm/i915/opregion: rvda is relative from opregion base in opregion 2.1+
  drm/i915/opregion: fix version check
  drm/i915: Prevent a race during I915_GEM_MMAP ioctl with WC set
  drm/i915: Block fbdev HPD processing during suspend
  drm/i915/pmu: Fix enable count array size and bounds checking
  drm/i915/cnl: Fix CNL macros for Voltage Swing programming
  drm/i915/icl: combo port vswing programming changes per BSPEC
  drm/vkms: Fix license inconsistent
  drm/amd/display: Expose connector VRR range via debugfs
  drm/sched: Always trace the dependencies we wait on, to fix a race.
  gpu: ipu-v3: pre: don't trigger update if buffer address doesn't change
  gpu: ipu-v3: Fix CSI offsets for imx53
  drm/imx: imx-ldb: add missing of_node_puts
  gpu: ipu-v3: Fix i.MX51 CSI control registers offset
  drm/imx: ignore plane updates on disabled crtcs
parents 2aba3220 69ef943d

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

+7 −2
Original line number Diff line number Diff line
@@ -90,8 +90,10 @@ static int psp_sw_fini(void *handle) 
	adev->psp.sos_fw = NULL;

	release_firmware(adev->psp.asd_fw);

	adev->psp.asd_fw = NULL;

	if (adev->psp.ta_fw) {

		release_firmware(adev->psp.ta_fw);

		adev->psp.ta_fw = NULL;

	}

	return 0;

}
@@ -435,6 +437,9 @@ static int psp_xgmi_initialize(struct psp_context *psp) 
	struct ta_xgmi_shared_memory *xgmi_cmd;

	int ret;



	if (!psp->adev->psp.ta_fw)

		return -ENOENT;



	if (!psp->xgmi_context.initialized) {

		ret = psp_xgmi_init_shared_buf(psp);

		if (ret)

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

+16 −12
Original line number Diff line number Diff line
@@ -152,9 +152,12 @@ static int psp_v11_0_init_microcode(struct psp_context *psp) 


	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ta.bin", chip_name);

	err = request_firmware(&adev->psp.ta_fw, fw_name, adev->dev);

	if (err)

		goto out2;



	if (err) {

		release_firmware(adev->psp.ta_fw);

		adev->psp.ta_fw = NULL;

		dev_info(adev->dev,

			 "psp v11.0: Failed to load firmware \"%s\"\n", fw_name);

	} else {

		err = amdgpu_ucode_validate(adev->psp.ta_fw);

		if (err)

			goto out2;
@@ -164,6 +167,7 @@ static int psp_v11_0_init_microcode(struct psp_context *psp) 
		adev->psp.ta_xgmi_ucode_size = le32_to_cpu(ta_hdr->ta_xgmi_size_bytes);

		adev->psp.ta_xgmi_start_addr = (uint8_t *)ta_hdr +

			le32_to_cpu(ta_hdr->header.ucode_array_offset_bytes);

	}



	return 0;

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c

+21 −1
Original line number Diff line number Diff line
@@ -671,6 +671,25 @@ static ssize_t dp_phy_test_pattern_debugfs_write(struct file *f, const char __us 
	return bytes_from_user;

}



/*

 * Returns the min and max vrr vfreq through the connector's debugfs file.

 * Example usage: cat /sys/kernel/debug/dri/0/DP-1/vrr_range

 */

static int vrr_range_show(struct seq_file *m, void *data)

{

	struct drm_connector *connector = m->private;

	struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);



	if (connector->status != connector_status_connected)

		return -ENODEV;



	seq_printf(m, "Min: %u\n", (unsigned int)aconnector->min_vfreq);

	seq_printf(m, "Max: %u\n", (unsigned int)aconnector->max_vfreq);



	return 0;

}

DEFINE_SHOW_ATTRIBUTE(vrr_range);



static const struct file_operations dp_link_settings_debugfs_fops = {

	.owner = THIS_MODULE,

	.read = dp_link_settings_read,
@@ -697,7 +716,8 @@ static const struct { 
} dp_debugfs_entries[] = {

		{"link_settings", &dp_link_settings_debugfs_fops},

		{"phy_settings", &dp_phy_settings_debugfs_fop},

		{"test_pattern", &dp_phy_test_pattern_fops}

		{"test_pattern", &dp_phy_test_pattern_fops},

		{"vrr_range", &vrr_range_fops}

};



int connector_debugfs_init(struct amdgpu_dm_connector *connector)

drivers/gpu/drm/drm_lease.c

+2 −1
Original line number Diff line number Diff line
@@ -528,7 +528,8 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, 


	object_count = cl->object_count;



	object_ids = memdup_user(u64_to_user_ptr(cl->object_ids), object_count * sizeof(__u32));

	object_ids = memdup_user(u64_to_user_ptr(cl->object_ids),

			array_size(object_count, sizeof(__u32)));

	if (IS_ERR(object_ids))

		return PTR_ERR(object_ids);

drivers/gpu/drm/i915/i915_gem.c

+11 −1
Original line number Diff line number Diff line
@@ -1824,6 +1824,16 @@ i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data, 
	return 0;

}



static inline bool

__vma_matches(struct vm_area_struct *vma, struct file *filp,

	      unsigned long addr, unsigned long size)

{

	if (vma->vm_file != filp)

		return false;



	return vma->vm_start == addr && (vma->vm_end - vma->vm_start) == size;

}



/**

 * i915_gem_mmap_ioctl - Maps the contents of an object, returning the address

 *			 it is mapped to.
@@ -1882,7 +1892,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, 
			return -EINTR;

		}

		vma = find_vma(mm, addr);

		if (vma)

		if (vma && __vma_matches(vma, obj->base.filp, addr, args->size))

			vma->vm_page_prot =

				pgprot_writecombine(vm_get_page_prot(vma->vm_flags));

		else