]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Backmerge tag 'v4.9-rc8' into drm-next
authorDave Airlie <airlied@redhat.com>
Mon, 5 Dec 2016 07:11:48 +0000 (17:11 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 5 Dec 2016 07:11:48 +0000 (17:11 +1000)
Linux 4.9-rc8

Daniel requested this so we could apply some follow on fixes cleanly to -next.

1  2 
MAINTAINERS
arch/x86/kvm/x86.c
drivers/gpu/drm/amd/amdgpu/amdgpu.h
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
drivers/gpu/drm/arm/hdlcd_crtc.c
drivers/gpu/drm/arm/hdlcd_drv.c
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/sun4i/sun4i_drv.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
index faab7f9bd3b75bdacd99755c1bf9e567439aadfb,e138fb51e8ce58e1ac6bad38c96447e68152ec48..e5f4f4a6546d1e8a51268285c19dc6086e328cfa
@@@ -365,20 -371,10 +365,19 @@@ static int hdlcd_drm_bind(struct devic
                goto err_fbdev;
        }
  
 +      ret = drm_dev_register(drm, 0);
 +      if (ret)
 +              goto err_register;
 +
        return 0;
  
 +err_register:
 +      if (hdlcd->fbdev) {
 +              drm_fbdev_cma_fini(hdlcd->fbdev);
 +              hdlcd->fbdev = NULL;
 +      }
  err_fbdev:
        drm_kms_helper_poll_fini(drm);
-       drm_mode_config_cleanup(drm);
        drm_vblank_cleanup(drm);
  err_vblank:
        pm_runtime_disable(drm->dev);
Simple merge
Simple merge