BackMerge tag 'v4.15-rc8' into drm-next

Linux 4.15-rc8

Daniel requested this for so the intel CI won't fall over on drm-next
so often.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/base/Kconfig
Simple merge

diff --cc drivers/gpu/drm/drm_syncobj.c
index 131695915acd11a5dc08328d3f63621d4e2be7af,cb4d09c70fd44647f30b6d10244f25e90db0835f..0b7b0d1ad2d595a2efacde1cdd4472b401a73278
--- 1/drivers/gpu/drm/drm_syncobj.c
--- 2/drivers/gpu/drm/drm_syncobj.c
+++ b/drivers/gpu/drm/drm_syncobj.c
@@@ -399,35 -369,9 +399,18 @@@ static const struct file_operations drm
        .release = drm_syncobj_file_release,
  };
  
- static int drm_syncobj_alloc_file(struct drm_syncobj *syncobj)
- {
-       struct file *file = anon_inode_getfile("syncobj_file",
-                                              &drm_syncobj_file_fops,
-                                              syncobj, 0);
-       if (IS_ERR(file))
-               return PTR_ERR(file);
- 
-       drm_syncobj_get(syncobj);
-       if (cmpxchg(&syncobj->file, NULL, file)) {
-               /* lost the race */
-               fput(file);
-       }
- 
-       return 0;
- }
- 
 +/**
 + * drm_syncobj_get_fd - get a file descriptor from a syncobj
 + * @syncobj: Sync object to export
 + * @p_fd: out parameter with the new file descriptor
 + *
 + * Exports a sync object created with drm_syncobj_create() as a file descriptor.
 + *
 + * Returns 0 on success or a negative error value on failure.
 + */
  int drm_syncobj_get_fd(struct drm_syncobj *syncobj, int *p_fd)
  {
-       int ret;
+       struct file *file;
        int fd;
  
        fd = get_unused_fd_flags(O_CLOEXEC);

diff --cc drivers/gpu/drm/i915/gvt/cmd_parser.c
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/gtt.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_reg.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_cdclk.c
index 9c5ceb98d48f459d802de4b066bb4bcacbc677ba,60cf4e58389ae601faf40cd9c68055b43eb39494..d77e2bec1e29ded804c05ef1df9f262839438454
--- 1/drivers/gpu/drm/i915/intel_cdclk.c
--- 2/drivers/gpu/drm/i915/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/intel_cdclk.c
@@@ -994,9 -917,11 +988,9 @@@ static void skl_set_cdclk(struct drm_i9
  {
        int cdclk = cdclk_state->cdclk;
        int vco = cdclk_state->vco;
-       u32 freq_select;
 -      u32 freq_select, pcu_ack, cdclk_ctl;
++      u32 freq_select, cdclk_ctl;
        int ret;
  
 -      WARN_ON((cdclk == 24000) != (vco == 0));
 -
        mutex_lock(&dev_priv->pcu_lock);
        ret = skl_pcode_request(dev_priv, SKL_PCODE_CDCLK_CONTROL,
                                SKL_CDCLK_PREPARE_FOR_CHANGE,
@@@ -1009,16 -934,8 +1003,16 @@@
                return;
        }
  
-       /* set CDCLK_CTL */
+       /* Choose frequency for this cdclk */
        switch (cdclk) {
 +      default:
 +              WARN_ON(cdclk != dev_priv->cdclk.hw.ref);
 +              WARN_ON(vco != 0);
 +              /* fall through */
 +      case 308571:
 +      case 337500:
 +              freq_select = CDCLK_FREQ_337_308;
 +              break;
        case 450000:
        case 432000:
                freq_select = CDCLK_FREQ_450_432;

diff --cc drivers/gpu/drm/i915/intel_engine_cs.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_lrc.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_runtime_pm.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_bo.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_fbcon.c
Simple merge

diff --cc drivers/gpu/drm/sun4i/sun4i_tcon.c
index a897f82d9e66e38a10ce86957fc44d5830dab02b,f4284b51bdca99a04e8eda109a4d67bf5c9fac74..b78fed809992cac3a94e4db43c5f7bf7afa166e4
--- 1/drivers/gpu/drm/sun4i/sun4i_tcon.c
--- 2/drivers/gpu/drm/sun4i/sun4i_tcon.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c
@@@ -946,26 -724,12 +946,26 @@@ static int sun4i_tcon_bind(struct devic
        if (IS_ERR(tcon->crtc)) {
                dev_err(dev, "Couldn't create our CRTC\n");
                ret = PTR_ERR(tcon->crtc);
-               goto err_free_clocks;
+               goto err_free_dotclock;
        }
  
 -      ret = sun4i_rgb_init(drm, tcon);
 +      /*
 +       * If we have an LVDS panel connected to the TCON, we should
 +       * just probe the LVDS connector. Otherwise, just probe RGB as
 +       * we used to.
 +       */
 +      remote = of_graph_get_remote_node(dev->of_node, 1, 0);
 +      if (of_device_is_compatible(remote, "panel-lvds"))
 +              if (can_lvds)
 +                      ret = sun4i_lvds_init(drm, tcon);
 +              else
 +                      ret = -EINVAL;
 +      else
 +              ret = sun4i_rgb_init(drm, tcon);
 +      of_node_put(remote);
 +
        if (ret < 0)
-               goto err_free_clocks;
+               goto err_free_dotclock;
  
        if (tcon->quirks->needs_de_be_mux) {
                /*

diff --cc drivers/gpu/drm/tegra/sor.c
Simple merge

diff --cc drivers/gpu/drm/ttm/ttm_page_alloc.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
Simple merge