xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next

Browse Source 
Backmerge to catch up with 4.3. slightly more involved conflict in the
irq code, but nothing beyond adjacent changes.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
This commit is contained in:
Daniel Vetter
2015-09-30 08:47:41 +02:00
parent 40a4a5727f 2d4df13c0f
commit 44cc6c08da
9597 changed files with 499456 additions and 230029 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/intel_fbdev.c
View File

@@ -686,6 +686,8 @@ int intel_fbdev_init(struct drm_device *dev)
return ret;
}
ifbdev->helper.atomic = true;
dev_priv->fbdev = ifbdev;
INIT_WORK(&dev_priv->fbdev_suspend_work, intel_fbdev_suspend_worker);