]> Git Repo - linux.git/commitdiff
Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm...
authorDave Airlie <[email protected]>
Wed, 28 Sep 2016 01:09:59 +0000 (11:09 +1000)
committerDave Airlie <[email protected]>
Wed, 28 Sep 2016 01:09:59 +0000 (11:09 +1000)
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

1  2 
drivers/gpu/drm/msm/msm_drv.c

index 042bde48200d50b3b1866dcd9048355be91a7c51,46419be5ac4bafc97364915a12557d76cc89260b..fb5c0b0a7594adcb0f38858cce0fc87d786f4eaa
   * 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)
@@@ -347,9 -348,9 +348,9 @@@ static int msm_drm_init(struct device *
        int ret;
  
        ddev = drm_dev_alloc(drv, dev);
 -      if (!ddev) {
 +      if (IS_ERR(ddev)) {
                dev_err(dev, "failed to allocate drm_device\n");
 -              return -ENOMEM;
 +              return PTR_ERR(ddev);
        }
  
        platform_set_drvdata(pdev, ddev);
This page took 0.065379 seconds and 4 git commands to generate.