Merge tag 'drm-for-v4.8' of git://people.freedesktop.org/~airlied/linux

Merge drm updates from Dave Airlie:
 "This is the main drm pull request for 4.8.

  I'm down with a cold at the moment so hopefully this isn't in too bad
  a state, I finished pulling stuff last week mostly (nouveau fixes just
  went in today), so only this message should be influenced by illness.
  Apologies to anyone who's major feature I missed :-)

  Core:
        Lockless GEM BO freeing
        Non-blocking atomic work
        Documentation changes (rst/sphinx)
        Prep for new fencing changes
        Simple display helpers
        Master/auth changes
        Register/unregister rework
        Loads of trivial patches/fixes.

  New stuff:
        ARM Mali display driver (not the 3D chip)
        sii902x RGB->HDMI bridge

  Panel:
        Support for new panels
        Improved backlight support

  Bridge:
        Convert ADV7511 to bridge driver
        ADV7533 support
        TC358767 (DSI/DPI to eDP) encoder chip support

  i915:
        BXT support enabled by default
        GVT-g infrastructure
        GuC command submission and fixes
        BXT workarounds
        SKL/BKL workarounds
        Demidlayering device registration
        Thundering herd fixes
        Missing pci ids
        Atomic updates

  amdgpu/radeon:
        ATPX improvements for better dGPU power control on PX systems
        New power features for CZ/BR/ST
        Pipelined BO moves and evictions in TTM
        GPU scheduler improvements
        GPU reset improvements
        Overclocking on dGPUs with amdgpu
        Polaris powermanagement enabled

  nouveau:
        GK20A/GM20B volt and clock improvements.
        Initial support for GP100/GP104 GPUs, GP104 will not yet support
        acceleration due to NVIDIA having not released firmware for them as of yet.

  exynos:
        Exynos5433 SoC with IOMMU support.

  vc4:
        Shader validation for branching

  imx-drm:
        Atomic mode setting conversion
        Reworked DMFC FIFO allocation
        External bridge support

  analogix-dp:
        RK3399 eDP support
        Lots of fixes.

  rockchip:
        Lots of small fixes.

  msm:
        DT bindings cleanups
        Shrinker and madvise support
        ASoC HDMI codec support

  tegra:
        Host1x driver cleanups
        SOR reworking for DP support
        Runtime PM support

  omapdrm:
        PLL enhancements
        Header refactoring
        Gamma table support

  arcgpu:
        Simulator support

  virtio-gpu:
        Atomic modesetting fixes.

  rcar-du:
        Misc fixes.

  mediatek:
        MT8173 HDMI support

  sti:
        ASOC HDMI codec support
        Minor fixes

  fsl-dcu:
        Suspend/resume support
        Bridge support

  amdkfd:
        Minor fixes.

  etnaviv:
        Enable GPU clock gating

  hisilicon:
        Vblank and other fixes"

* tag 'drm-for-v4.8' of git://people.freedesktop.org/~airlied/linux: (1575 commits)
  drm/nouveau/gr/nv3x: fix instobj write offsets in gr setup
  drm/nouveau/acpi: fix lockup with PCIe runtime PM
  drm/nouveau/acpi: check for function 0x1B before using it
  drm/nouveau/acpi: return supported DSM functions
  drm/nouveau/acpi: ensure matching ACPI handle and supported functions
  drm/nouveau/fbcon: fix font width not divisible by 8
  drm/amd/powerplay: remove enable_clock_power_gatings_tasks from initialize and resume events
  drm/amd/powerplay: move clockgating to after ungating power in pp for uvd/vce
  drm/amdgpu: add query device id and revision id into system info entry at CGS
  drm/amdgpu: add new definition in bif header
  drm/amd/powerplay: rename smum header guards
  drm/amdgpu: enable UVD context buffer for older HW
  drm/amdgpu: fix default UVD context size
  drm/amdgpu: fix incorrect type of info_id
  drm/amdgpu: make amdgpu_cgs_call_acpi_method as static
  drm/amdgpu: comment out unused defaults_staturn_pro static const structure to fix the build
  drm/amdgpu: enable UVD VM only on polaris
  drm/amdgpu: increase timeout of IB test
  drm/amdgpu: add destroy session when generate VCE destroy msg.
  drm/amd: fix deadlock of job_list_lock V2
  ...

diff --cc Documentation/DocBook/Makefile
Simple merge

diff --cc Documentation/DocBook/device-drivers.tmpl
Simple merge

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc Documentation/index.rst
index 43c722f1529271e4826961b767e8499ad73e6ba9,dacc77b43c299f3e87beb00dc240d1bd62f00270..e0fc72963e879d11dd70985bb1d1ed500694a9a5
--- 1/Documentation/index.rst
--- 2/Documentation/index.rst
+++ b/Documentation/index.rst
@@@ -13,11 -13,7 +13,12 @@@ Contents
  .. toctree::
     :maxdepth: 2
  
 +   kernel-documentation
 +   media/media_uapi
 +   media/media_kapi
 +   media/dvb-drivers/index
 +   media/v4l-drivers/index
+    gpu/index
  
  Indices and tables
  ==================

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/drm_gem.c
Simple merge

diff --cc drivers/gpu/drm/etnaviv/etnaviv_gem.c
Simple merge

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

diff --cc drivers/gpu/drm/omapdrm/omap_gem.c
Simple merge

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

diff --cc drivers/media/platform/omap/omap_vout.c
Simple merge

diff --cc drivers/media/platform/omap/omap_voutdef.h
index 49de1475e473f27037bbdd54a8b1628ed2bbe0ff,94b5d65afb19b95da62b1862a9aad7f96169b133..80c79fabdf95b463b49743515488d18c7fafed9b
--- 1/drivers/media/platform/omap/omap_voutdef.h
--- 2/drivers/media/platform/omap/omap_voutdef.h
+++ b/drivers/media/platform/omap/omap_voutdef.h
@@@ -11,8 -11,7 +11,8 @@@
  #ifndef OMAP_VOUTDEF_H
  #define OMAP_VOUTDEF_H
  
- #include <video/omapdss.h>
 +#include <media/v4l2-ctrls.h>
+ #include <video/omapfb_dss.h>
  #include <video/omapvrfb.h>
  
  #define YUYV_BPP        2

diff --cc drivers/staging/android/sync_debug.h
index 425ebc5c32aa2afcc4965afb4efdbf2248463c52,0000000000000000000000000000000000000000..fab66396d421db42a88a40c08b4530370b3a44b3
mode 100644,000000..100644
--- 1/drivers/staging/android/sync_debug.h
--- /dev/null
+++ b/drivers/staging/android/sync_debug.h
@@@ -1,83 -1,0 +1,84 @@@
-       int                     context, value;
 +/*
 + * include/linux/sync.h
 + *
 + * Copyright (C) 2012 Google, Inc.
 + *
 + * This program is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + * GNU General Public License for more details.
 + *
 + */
 +
 +#ifndef _LINUX_SYNC_H
 +#define _LINUX_SYNC_H
 +
 +#include <linux/list.h>
 +#include <linux/spinlock.h>
 +#include <linux/fence.h>
 +
 +#include <linux/sync_file.h>
 +#include <uapi/linux/sync_file.h>
 +
 +/**
 + * struct sync_timeline - sync object
 + * @kref:             reference count on fence.
 + * @name:             name of the sync_timeline. Useful for debugging
 + * @child_list_head:  list of children sync_pts for this sync_timeline
 + * @child_list_lock:  lock protecting @child_list_head and fence.status
 + * @active_list_head: list of active (unsignaled/errored) sync_pts
 + * @sync_timeline_list:       membership in global sync_timeline_list
 + */
 +struct sync_timeline {
 +      struct kref             kref;
 +      char                    name[32];
 +
 +      /* protected by child_list_lock */
++      u64                     context;
++      int                     value;
 +
 +      struct list_head        child_list_head;
 +      spinlock_t              child_list_lock;
 +
 +      struct list_head        active_list_head;
 +
 +      struct list_head        sync_timeline_list;
 +};
 +
 +static inline struct sync_timeline *fence_parent(struct fence *fence)
 +{
 +      return container_of(fence->lock, struct sync_timeline,
 +                          child_list_lock);
 +}
 +
 +/**
 + * struct sync_pt - sync_pt object
 + * @base: base fence object
 + * @child_list: sync timeline child's list
 + * @active_list: sync timeline active child's list
 + */
 +struct sync_pt {
 +      struct fence base;
 +      struct list_head child_list;
 +      struct list_head active_list;
 +};
 +
 +#ifdef CONFIG_SW_SYNC
 +
 +extern const struct file_operations sw_sync_debugfs_fops;
 +
 +void sync_timeline_debug_add(struct sync_timeline *obj);
 +void sync_timeline_debug_remove(struct sync_timeline *obj);
 +void sync_file_debug_add(struct sync_file *fence);
 +void sync_file_debug_remove(struct sync_file *fence);
 +void sync_dump(void);
 +
 +#else
 +# define sync_timeline_debug_add(obj)
 +# define sync_timeline_debug_remove(obj)
 +# define sync_file_debug_add(fence)
 +# define sync_file_debug_remove(fence)
 +# define sync_dump()
 +#endif
 +
 +#endif /* _LINUX_SYNC_H */

diff --cc include/linux/fence.h
Simple merge