[openchrome-devel] drm-openchrome: Branch 'drm-next-5.2' - 4 commits - drivers/gpu/drm

[Kevin Brace]

 drivers/gpu/drm/openchrome/openchrome_drv.c    |   13 +++----------
 drivers/gpu/drm/openchrome/openchrome_drv.h    |    4 ++--
 drivers/gpu/drm/openchrome/openchrome_fb.c     |    8 +-------
 drivers/gpu/drm/openchrome/openchrome_object.c |    1 -
 4 files changed, 6 insertions(+), 20 deletions(-)

New commits:
commit ed442def67c1bd78f3a0ec0dade998489b696cca
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue May 21 13:50:06 2019 -0500

    drm/openchrome: Version bumped to 3.1.7
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index cb4306d204c6..a5e20c1979eb 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -51,10 +51,10 @@
 
 #define DRIVER_MAJOR		3
 #define DRIVER_MINOR		1
-#define DRIVER_PATCHLEVEL	6
+#define DRIVER_PATCHLEVEL	7
 #define DRIVER_NAME		"openchrome"
 #define DRIVER_DESC		"OpenChrome DRM for VIA Technologies Chrome IGP"
-#define DRIVER_DATE		"20190316"
+#define DRIVER_DATE		"20190521"
 #define DRIVER_AUTHOR		"OpenChrome Project"
 
 
commit 1bcc5d1095171232dfb4b4ce750d19b4842205d5
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue May 21 13:43:17 2019 -0500

    drm/openchrome: Quick-test mmap offset in ttm_bo_mmap()
    
    Based on commit bed2dd84212eb0151ae3bfc39cdaa25a951749c1 (drm/ttm:
    Quick-test mmap offset in ttm_bo_mmap()).
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.c b/drivers/gpu/drm/openchrome/openchrome_drv.c
index f5045c9f520d..1049cf352a55 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.c
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.c
@@ -340,20 +340,13 @@ static void via_driver_lastclose(struct drm_device *dev)
 
 static int openchrome_drm_mmap(struct file *filp, struct vm_area_struct *vma)
 {
-	struct drm_file *file_priv;
-	struct openchrome_drm_private *dev_private;
+	struct drm_file *file_priv = filp->private_data;
+	struct openchrome_drm_private *dev_private =
+				file_priv->minor->dev->dev_private;
 	int ret = -EINVAL;
 
 	DRM_DEBUG_KMS("Entered %s.\n", __func__);
 
-	if (vma->vm_pgoff < DRM_FILE_PAGE_OFFSET) {
-		DRM_DEBUG_KMS("VMA Error.\n");
-		ret = -EINVAL;
-		goto exit;
-	}
-
-	file_priv = filp->private_data;
-	dev_private = file_priv->minor->dev->dev_private;
 	if (!dev_private) {
 		DRM_DEBUG_KMS("No device private data.\n");
 		ret = -EINVAL;
commit 9ada444b65113fef269062ecf2642a890ece3fb1
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue May 21 13:42:07 2019 -0500

    drm/openchrome: Remove file_page_offset parameter from ttm_bo_device_init()
    
    Based on commit 7d1500f9fbfc78e6a34be3f8f4b5ba13e8227199 (drm/ttm:
    Remove file_page_offset parameter from ttm_bo_device_init()).
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_object.c b/drivers/gpu/drm/openchrome/openchrome_object.c
index 2cd8d2ebe195..089218d0206e 100644
--- a/drivers/gpu/drm/openchrome/openchrome_object.c
+++ b/drivers/gpu/drm/openchrome/openchrome_object.c
@@ -201,7 +201,6 @@ int openchrome_mm_init(struct openchrome_drm_private *dev_private)
 	ret = ttm_bo_device_init(&dev_private->bdev,
 				&openchrome_bo_driver,
 				dev->anon_inode->i_mapping,
-				DRM_FILE_PAGE_OFFSET,
 				dev_private->need_dma32);
 	if (ret) {
 		DRM_ERROR("Failed initializing buffer object driver.\n");
commit e02530e0091d5aa506204a553befbbee6d5e3ba9
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon May 20 20:03:41 2019 -0500

    drm/openchrome: Use drm_fb_helper_fill_info
    
    Based on commits 3df3116ab4b164942cdc081a490d188eb9bc43ac
    (drm/fb-helper: Add fill_info() functions),
    f1eca684b71375f688bc5c29fcb6013ab78c35f3 (drm/fb-helper: set
    fbi->fix.id in fill_info()), and
    ecbfc474f0df67e827bc1d9f39111c05bbef786a (drm/fb_helper: set
    info->par in fill_info()).
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_fb.c b/drivers/gpu/drm/openchrome/openchrome_fb.c
index 420a49cadc48..32100f7b90fd 100644
--- a/drivers/gpu/drm/openchrome/openchrome_fb.c
+++ b/drivers/gpu/drm/openchrome/openchrome_fb.c
@@ -273,7 +273,6 @@ via_fb_probe(struct drm_fb_helper *helper,
 		goto out_err;
 	}
 
-	info->par = via_fbdev;
 	info->skip_vt_switch = true;
 
 	drm_helper_mode_fill_fb_struct(dev, fb, &mode_cmd);
@@ -286,9 +285,6 @@ via_fb_probe(struct drm_fb_helper *helper,
 	via_fbdev->helper.fb = fb;
 	via_fbdev->helper.fbdev = info;
 
-	strcpy(info->fix.id, dev->driver->name);
-	strcat(info->fix.id, "drmfb");
-
 	info->fbops = &via_fb_ops;
 
 	info->fix.smem_start = bo->kmap.bo->mem.bus.base +
@@ -309,9 +305,7 @@ via_fb_probe(struct drm_fb_helper *helper,
 	ap->ranges[0].base = bo->kmap.bo->mem.bus.base;
 	info->apertures = ap;
 
-	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
-	drm_fb_helper_fill_var(info, helper,
-				sizes->fb_width, sizes->fb_height);
+	drm_fb_helper_fill_info(info, helper, sizes);
 	goto exit;
 out_err:
 	if (bo->kmap.bo) {