From: Dave Airlie <airlied@redhat.com>
Date: Fri, 27 Jan 2017 01:00:42 +0000 (+1000)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b0df0b251b25b0bf89ef3e518330fcac300add86;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux into drm-next

Backmerge Linus master to get the connector locking revert.

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux: (645 commits)
  sysctl: fix proc_doulongvec_ms_jiffies_minmax()
  Revert "drm/probe-helpers: Drop locking from poll_enable"
  MAINTAINERS: add Dan Streetman to zbud maintainers
  MAINTAINERS: add Dan Streetman to zswap maintainers
  mm: do not export ioremap_page_range symbol for external module
  mn10300: fix build error of missing fpu_save()
  romfs: use different way to generate fsid for BLOCK or MTD
  frv: add missing atomic64 operations
  mm, page_alloc: fix premature OOM when racing with cpuset mems update
  mm, page_alloc: move cpuset seqcount checking to slowpath
  mm, page_alloc: fix fast-path race with cpuset update or removal
  mm, page_alloc: fix check for NULL preferred_zone
  kernel/panic.c: add missing \n
  fbdev: color map copying bounds checking
  frv: add atomic64_add_unless()
  mm/mempolicy.c: do not put mempolicy before using its nodemask
  radix-tree: fix private list warnings
  Documentation/filesystems/proc.txt: add VmPin
  mm, memcg: do not retry precharge charges
  proc: add a schedule point in proc_pid_readdir()
  ...
---

b0df0b251b25b0bf89ef3e518330fcac300add86
diff --cc drivers/gpu/drm/drm_probe_helper.c
index 97a32898ef50,cf8f0128c161..79519e4983c7
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@@ -143,11 -141,20 +143,21 @@@ void drm_kms_helper_poll_enable_locked(
  					 DRM_CONNECTOR_POLL_DISCONNECT))
  			poll = true;
  	}
 +	drm_connector_list_iter_put(&conn_iter);
  
  	if (dev->mode_config.delayed_event) {
+ 		/*
+ 		 * FIXME:
+ 		 *
+ 		 * Use short (1s) delay to handle the initial delayed event.
+ 		 * This delay should not be needed, but Optimus/nouveau will
+ 		 * fail in a mysterious way if the delayed event is handled as
+ 		 * soon as possible like it is done in
+ 		 * drm_helper_probe_single_connector_modes() in case the poll
+ 		 * was enabled before.
+ 		 */
  		poll = true;
- 		delay = 0;
+ 		delay = HZ;
  	}
  
  	if (poll)
diff --cc drivers/gpu/drm/virtio/virtgpu_fb.c
index 61254b991265,cde9f3758106..24f99fc9d8a4
--- a/drivers/gpu/drm/virtio/virtgpu_fb.c
+++ b/drivers/gpu/drm/virtio/virtgpu_fb.c
@@@ -331,9 -331,9 +331,9 @@@ static int virtio_gpufb_create(struct d
  	info->fbops = &virtio_gpufb_ops;
  	info->pixmap.flags = FB_PIXMAP_SYSTEM;
  
- 	info->screen_base = obj->vmap;
+ 	info->screen_buffer = obj->vmap;
  	info->screen_size = obj->gem_base.size;
 -	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
 +	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
  	drm_fb_helper_fill_var(info, &vfbdev->helper,
  			       sizes->fb_width, sizes->fb_height);