From: Gustavo Padovan <gustavo.padovan@collabora.com>
Date: Thu, 28 Jun 2018 21:56:03 +0000 (-0300)
Subject: Merge tag 'ib-fbdev-drm-v4.19-deferred-console-takeover' of https://github.com/bzolni... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c981c01164d5e47b98973f92d4680df4287275c2;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'ib-fbdev-drm-v4.19-deferred-console-takeover' of https://github.com/bzolnier/linux into drm-misc-next

Immutable branch between fbdev and drm for the v4.19 merge window
(contains the deferred console takeover feature)

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>

# gpg: Signature made Thu 28 Jun 2018 10:24:50 AM -03
# gpg:                using RSA key 7E33B63FA047C20B
# gpg: Can't check signature: public key not found

# Conflicts:
#	drivers/gpu/drm/i915/i915_gem.c
#	drivers/gpu/drm/i915/intel_crt.c
#	drivers/gpu/drm/i915/intel_display.c
#	drivers/gpu/drm/i915/intel_lrc.c
Link: https://patchwork.freedesktop.org/patch/msgid/2462549.rLSfW9kX99@amdc3058
---

c981c01164d5e47b98973f92d4680df4287275c2
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index 04d77f19acc8,3ff08e326838..cc15d3230402
--- 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