Merge tag 'ib-fbdev-drm-v4.19-deferred-console-takeover' of https://github.com/bzolni...

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index 04d77f19acc8550fde7cc9f1b7856a9af0c803c4,3ff08e326838f381a91d542e3e2ee7484b46c5b3..cc15d32304022c7f01d42ad38ffc94d67c9da767
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
--- 2/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

diff --cc drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
Simple merge

diff --cc drivers/gpu/drm/sun4i/sun4i_tcon.c
Simple merge