[Openchrome-devel] drm-openchrome: Branch 'drm-next-4.13' - 2 commits - drivers/gpu/drm

[Kevin Brace]

 drivers/gpu/drm/openchrome/via_crtc.c |    4 ++--
 drivers/gpu/drm/openchrome/via_ttm.c  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8ac85029f5a03ddcc40e3bd9d1811b0145abb1c8
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Aug 4 17:06:49 2017 -0700

    Replace TTM_PL_FLAG_PRIV0 with TTM_PL_FLAG_PRIV
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/via_ttm.c b/drivers/gpu/drm/openchrome/via_ttm.c
index 9ddba1ce51be..2bbc7ce06a87 100644
--- a/drivers/gpu/drm/openchrome/via_ttm.c
+++ b/drivers/gpu/drm/openchrome/via_ttm.c
@@ -616,7 +616,7 @@ int via_mm_init(struct via_device *dev_priv)
     }
 
     ret = via_bo_create(&dev_priv->bdev, VIA_MMIO_REGSIZE, ttm_bo_type_kernel,
-                        TTM_PL_FLAG_PRIV0, 1, PAGE_SIZE, false, NULL, NULL, &bo);
+                        TTM_PL_FLAG_PRIV, 1, PAGE_SIZE, false, NULL, NULL, &bo);
     if (ret) {
         DRM_ERROR("Failed to create a buffer object for MMIO: %d\n", ret);
         goto exit;
commit f0d3baa4c5503bb7700fa0ec2c0c708fe65197ad
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Aug 4 17:05:12 2017 -0700

    Replace drm_vblank_off with drm_crtc_vblank_off
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/via_crtc.c b/drivers/gpu/drm/openchrome/via_crtc.c
index ea282ba7231c..1fb5c7bd9d35 100644
--- a/drivers/gpu/drm/openchrome/via_crtc.c
+++ b/drivers/gpu/drm/openchrome/via_crtc.c
@@ -1086,7 +1086,7 @@ via_iga1_crtc_disable(struct drm_crtc *crtc)
 
     DRM_DEBUG("Entered via_iga1_crtc_disable.\n");
 
-    drm_vblank_off(crtc->dev, iga->index);
+    drm_crtc_vblank_off(crtc);
 
     /* Turn off the cursor */
     via_hide_cursor(crtc);
@@ -1370,7 +1370,7 @@ via_iga2_crtc_disable(struct drm_crtc *crtc)
 
     DRM_DEBUG("Entered via_iga2_crtc_disable.\n");
 
-    drm_vblank_off(crtc->dev, iga->index);
+    drm_crtc_vblank_off(crtc);
 
     /* Turn off the cursor */
     via_hide_cursor(crtc);