From: Dave Airlie <airlied@redhat.com>
Date: Wed, 4 Jul 2018 00:27:12 +0000 (+1000)
Subject: Merge v4.18-rc3 into drm-next
X-Git-Tag: v4.19~298^2~40
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f29135ee4e0d4e01911ed569f731bfdb841cea6d;p=platform%2Fkernel%2Flinux-rpi3.git

Merge v4.18-rc3 into drm-next

Two requests have come in for a backmerge,
and I've got some pull reqs on rc2, so this
just makes sense.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

f29135ee4e0d4e01911ed569f731bfdb841cea6d
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index 04d77f1,3ff08e3..cc15d32
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@@ -127,10 -127,10 +127,10 @@@ int amdgpu_uvd_sw_init(struct amdgpu_de
  	unsigned long bo_size;
  	const char *fw_name;
  	const struct common_firmware_header *hdr;
 -	unsigned version_major, version_minor, family_id;
 +	unsigned family_id;
  	int i, j, r;
  
- 	INIT_DELAYED_WORK(&adev->uvd.inst->idle_work, amdgpu_uvd_idle_work_handler);
+ 	INIT_DELAYED_WORK(&adev->uvd.idle_work, amdgpu_uvd_idle_work_handler);
  
  	switch (adev->asic_type) {
  #ifdef CONFIG_DRM_AMDGPU_CIK