diff options
| author | Dave Airlie | 2016-09-28 03:09:59 +0200 |
|---|---|---|
| committer | Dave Airlie | 2016-09-28 03:09:59 +0200 |
| commit | f8049dd865a1de8b494c16a4cd18ee15fa896810 (patch) | |
| tree | 37b874acba1392e97864dc24692736210543a4e4 /drivers/gpu/drm/msm/msm_drv.c | |
| parent | Merge tag 'topic/drm-misc-2016-09-25' of git://anongit.freedesktop.org/drm-in... (diff) | |
| parent | drm/msm: bump kernel api version for explicit fencing (diff) | |
| download | kernel-qcow2-linux-f8049dd865a1de8b494c16a4cd18ee15fa896810.tar.gz kernel-qcow2-linux-f8049dd865a1de8b494c16a4cd18ee15fa896810.tar.xz kernel-qcow2-linux-f8049dd865a1de8b494c16a4cd18ee15fa896810.zip | |
Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next
A bit smaller pull-req this time around. Some continued DT binding
cleanup to get the corresponding dts bits merged upstream (through
other trees). And explicit fence-fd support for submit ioctl.
* 'msm-next' of git://people.freedesktop.org/~robclark/linux:
drm/msm: bump kernel api version for explicit fencing
drm/msm: submit support for out-fences
drm/msm: move fence allocation out of msm_gpu_submit()
drm/msm: submit support for in-fences
drm/msm: extend the submit ioctl to pass in flags
drm/msm/mdp5: Set rotation property initial value to DRM_ROTATE_0 insted of 0
drm/msm/hdmi: don't print error when adding i2c adapter fails
drm/msm/mdp4: mark symbols static where possible
drm/msm: Remove call to reservation_object_test_signaled_rcu before wait
drm/msm/hdmi: Clean up HDMI gpio DT bindings
drm/msm/mdp4: Fix issue with LCDC/LVDS port parsing
Diffstat (limited to 'drivers/gpu/drm/msm/msm_drv.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 042bde48200d..fb5c0b0a7594 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -26,9 +26,10 @@ * MSM driver version: * - 1.0.0 - initial interface * - 1.1.0 - adds madvise, and support for submits with > 4 cmd buffers + * - 1.2.0 - adds explicit fence support for submit ioctl */ #define MSM_VERSION_MAJOR 1 -#define MSM_VERSION_MINOR 1 +#define MSM_VERSION_MINOR 2 #define MSM_VERSION_PATCHLEVEL 0 static void msm_fb_output_poll_changed(struct drm_device *dev) |