diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-03-04 13:37:39 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-03-04 13:37:39 +1000 |
| commit | 912b330c20096a9b579ec151ec1d2225eb93b38f (patch) | |
| tree | 08852a6eec9babf4ff48f3a0309136ca8d850597 /include/uapi | |
| parent | 42e85606784376e4f2d5355694b0b241dc8c29ae (diff) | |
| parent | fcda50c8f484cf1140232c8444470449f0619db9 (diff) | |
| download | linux-stable-912b330c20096a9b579ec151ec1d2225eb93b38f.tar.gz linux-stable-912b330c20096a9b579ec151ec1d2225eb93b38f.tar.bz2 linux-stable-912b330c20096a9b579ec151ec1d2225eb93b38f.zip | |
Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next
Big ticket items are hdmi support for 8996 (aka snapdragon 820), and
adreno 430 support. Also one more small uapi addition to support
timestamp queries.
* 'msm-next' of git://people.freedesktop.org/~robclark/linux: (29 commits)
drm/msm: rename hdmi symbols
drm/msm/adreno: remove duplicate adreno_hw_init() call
drm/msm: add timestamp param
drm/msm: fix small typo
drm/msm: grab struct_mutex after allocating submit
drm/msm: reject submit ioctl if no gpu
drm/msm/adreno: print details in case of a protect fault interrupt
drm/msm/adreno: get CP_RPTR from register instead of shadow memory
drm/msm/adreno: add adreno430 power control
drm/msm/adreno: support for adreno 430.
drm/msm: update generated headers
drm/msm/dsi: fix definition of msm_dsi_pll_28nm_8960_init()
drm/msm/dsi: Parse DSI lanes via DT
drm/msm/dsi: Drop VDD regulator for MSM8916
drm/msm/dsi: Remove incorrect warning on host attach
drm/msm: Free fb helper resources in msm_unload
drm/msm/mdp: Detach iommu in mdp4_destroy
drm/msm: make iommu port names const'ier
drm/msm/mdp: Use atomic helper to set crtc property
dt-bindings: msm/hdmi: Add HDMI PHY bindings
...
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/drm/msm_drm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h index 0e3c4c48b326..254d3e92d18e 100644 --- a/include/uapi/drm/msm_drm.h +++ b/include/uapi/drm/msm_drm.h @@ -51,6 +51,7 @@ struct drm_msm_timespec { #define MSM_PARAM_GMEM_SIZE 0x02 #define MSM_PARAM_CHIP_ID 0x03 #define MSM_PARAM_MAX_FREQ 0x04 +#define MSM_PARAM_TIMESTAMP 0x05 struct drm_msm_param { __u32 pipe; /* in, MSM_PIPE_x */ |