Commit 1d428714 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2020-07-03' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Pretty usual rc4 pull: two usual amdgpu, i915 pulls, and some misc arm
  driver fixes.

  The bigger bit is including the asm sources for some GPU shaders that
  were contained in the i915 driver, otherwise it's pretty much business
  as usual.

  dma-buf:
   - fix a use-after-free bug

  amdgpu:
   - Fix for vega20 boards without RAS support
   - DC bandwidth revalidation fix
   - Fix Renoir vram info fetching
   - Fix hwmon freq printing

  i915:
   - GVT fixes
      - Two missed MMIO handler fixes for SKL/CFL
      - Fix mask register bits check
      - Fix one lockdep error for debugfs entry access
   - Include asm sources for render cache clear batches

  msm:
   - memleak fix
   - display block fix
   - address space fixes

  exynos:
   - error value and reference count fix
   - error print removal

  sun4i:
   - remove HPD polling"

* tag 'drm-fixes-2020-07-03' of git://anongit.freedesktop.org/drm/drm: (22 commits)
  drm/amdgpu: use %u rather than %d for sclk/mclk
  drm/amdgpu/atomfirmware: fix vram_info fetching for renoir
  drm/amd/display: Only revalidate bandwidth on medium and fast updates
  drm: sun4i: hdmi: Remove extra HPD polling
  drm/i915: Include asm sources for {ivb, hsw}_clear_kernel.c
  drm/exynos: fix ref count leak in mic_pre_enable
  drm/exynos: Properly propagate return value in drm_iommu_attach_device()
  drm/exynos: Remove dev_err() on platform_get_irq() failure
  drm/amd/powerplay: Fix NULL dereference in lock_bus() on Vega20 w/o RAS
  dma-buf: Move dma_buf_release() from fops to dentry_ops
  drm/msm: Fix up the rest of the messed up address sizes
  drm/msm: Fix setup of a6xx create_address_space.
  drm/msm: Fix address space size after refactor.
  drm/i915/gvt: Use GFP_ATOMIC instead of GFP_KERNEL in atomic context
  drm/i915/gvt: Fix incorrect check of enabled bits in mask registers
  drm/i915/gvt: Fix two CFL MMIO handling caused by regression.
  drm/i915/gvt: Add one missing MMIO handler for D_SKL_PLUS
  drm/msm: Fix 0xfffflub in "Refactor address space initialization"
  drm/msm/dpu: allow initialization of encoder locks during encoder init
  drm/msm/dpu: fix error return code in dpu_encoder_init
  ...
parents cdd3bb54 1298a549

drivers/dma-buf/dma-buf.c

+25 −29
Original line number Diff line number Diff line
@@ -54,37 +54,11 @@ static char *dmabuffs_dname(struct dentry *dentry, char *buffer, int buflen) 
			     dentry->d_name.name, ret > 0 ? name : "");

}



static const struct dentry_operations dma_buf_dentry_ops = {

	.d_dname = dmabuffs_dname,

};



static struct vfsmount *dma_buf_mnt;



static int dma_buf_fs_init_context(struct fs_context *fc)

{

	struct pseudo_fs_context *ctx;



	ctx = init_pseudo(fc, DMA_BUF_MAGIC);

	if (!ctx)

		return -ENOMEM;

	ctx->dops = &dma_buf_dentry_ops;

	return 0;

}



static struct file_system_type dma_buf_fs_type = {

	.name = "dmabuf",

	.init_fs_context = dma_buf_fs_init_context,

	.kill_sb = kill_anon_super,

};



static int dma_buf_release(struct inode *inode, struct file *file)

static void dma_buf_release(struct dentry *dentry)

{

	struct dma_buf *dmabuf;



	if (!is_dma_buf_file(file))

		return -EINVAL;



	dmabuf = file->private_data;

	dmabuf = dentry->d_fsdata;



	BUG_ON(dmabuf->vmapping_counter);
@@ -110,9 +84,32 @@ static int dma_buf_release(struct inode *inode, struct file *file) 
	module_put(dmabuf->owner);

	kfree(dmabuf->name);

	kfree(dmabuf);

}



static const struct dentry_operations dma_buf_dentry_ops = {

	.d_dname = dmabuffs_dname,

	.d_release = dma_buf_release,

};



static struct vfsmount *dma_buf_mnt;



static int dma_buf_fs_init_context(struct fs_context *fc)

{

	struct pseudo_fs_context *ctx;



	ctx = init_pseudo(fc, DMA_BUF_MAGIC);

	if (!ctx)

		return -ENOMEM;

	ctx->dops = &dma_buf_dentry_ops;

	return 0;

}



static struct file_system_type dma_buf_fs_type = {

	.name = "dmabuf",

	.init_fs_context = dma_buf_fs_init_context,

	.kill_sb = kill_anon_super,

};



static int dma_buf_mmap_internal(struct file *file, struct vm_area_struct *vma)

{

	struct dma_buf *dmabuf;
@@ -412,7 +409,6 @@ static void dma_buf_show_fdinfo(struct seq_file *m, struct file *file) 
}



static const struct file_operations dma_buf_fops = {

	.release	= dma_buf_release,

	.mmap		= dma_buf_mmap_internal,

	.llseek		= dma_buf_llseek,

	.poll		= dma_buf_poll,

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

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev, 
				(mode_info->atom_context->bios + data_offset);

			switch (crev) {

			case 11:

			case 12:

				mem_channel_number = igp_info->v11.umachannelnumber;

				/* channel width is 64 */

				if (vram_width)

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

+2 −2
Original line number Diff line number Diff line
@@ -2784,7 +2784,7 @@ static ssize_t amdgpu_hwmon_show_sclk(struct device *dev, 
	if (r)

		return r;



	return snprintf(buf, PAGE_SIZE, "%d\n", sclk * 10 * 1000);

	return snprintf(buf, PAGE_SIZE, "%u\n", sclk * 10 * 1000);

}



static ssize_t amdgpu_hwmon_show_sclk_label(struct device *dev,
@@ -2819,7 +2819,7 @@ static ssize_t amdgpu_hwmon_show_mclk(struct device *dev, 
	if (r)

		return r;



	return snprintf(buf, PAGE_SIZE, "%d\n", mclk * 10 * 1000);

	return snprintf(buf, PAGE_SIZE, "%u\n", mclk * 10 * 1000);

}



static ssize_t amdgpu_hwmon_show_mclk_label(struct device *dev,

drivers/gpu/drm/amd/display/dc/core/dc.c

+6 −4
Original line number Diff line number Diff line
@@ -2538,11 +2538,13 @@ void dc_commit_updates_for_stream(struct dc *dc, 


	copy_stream_update_to_stream(dc, context, stream, stream_update);



	if (update_type > UPDATE_TYPE_FAST) {

		if (!dc->res_pool->funcs->validate_bandwidth(dc, context, false)) {

			DC_ERROR("Mode validation failed for stream update!\n");

			dc_release_state(context);

			return;

		}

	}



	commit_planes_for_stream(

				dc,

drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c

+7 −4
Original line number Diff line number Diff line
@@ -522,9 +522,11 @@ static int vega20_smu_init(struct pp_hwmgr *hwmgr) 
	priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].version = 0x01;

	priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].size = sizeof(DpmActivityMonitorCoeffInt_t);



	if (adev->psp.ras.ras) {

		ret = smu_v11_0_i2c_eeprom_control_init(&adev->pm.smu_i2c);

		if (ret)

			goto err4;

	}



	return 0;
@@ -560,6 +562,7 @@ static int vega20_smu_fini(struct pp_hwmgr *hwmgr) 
			(struct vega20_smumgr *)(hwmgr->smu_backend);

	struct amdgpu_device *adev = hwmgr->adev;



	if (adev->psp.ras.ras)

		smu_v11_0_i2c_eeprom_control_fini(&adev->pm.smu_i2c);



	if (priv) {