From: Maxime Ripard <maxime@cerno.tech>
Date: Mon, 17 Feb 2020 09:34:34 +0000 (+0100)
Subject: Merge v5.6-rc2 into drm-misc-next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=28f2aff1caa4997f58ca31179cad1b4a84a62827;p=openwrt%2Fstaging%2Fblogic.git

Merge v5.6-rc2 into drm-misc-next

Lyude needs some patches in 5.6-rc2 and we didn't bring drm-misc-next
forward yet, so it looks like a good occasion.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---

28f2aff1caa4997f58ca31179cad1b4a84a62827
diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
index ac4804d0a991,9e67944bec9c..9a0cca2fd166
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -549,10 -553,10 +557,12 @@@ patternProperties
      description: Linear Technology Corporation
    "^logicpd,.*":
      description: Logic PD, Inc.
 +  "^logictechno,.*":
 +    description: Logic Technologies Limited
    "^longcheer,.*":
      description: Longcheer Technology (Shanghai) Co., Ltd.
+   "^loongson,.*":
+     description: Loongson Technology Corporation Limited
    "^lsi,.*":
      description: LSI Corp. (LSI Logic)
    "^lwn,.*":
diff --cc drivers/gpu/drm/nouveau/dispnv50/head.c
index 0b4c7a6fb39c,d9d64602947d..8f6455697ba7
--- a/drivers/gpu/drm/nouveau/dispnv50/head.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head.c
@@@ -473,12 -481,9 +483,12 @@@ nv50_head_func = 
  	.page_flip = drm_atomic_helper_page_flip,
  	.atomic_duplicate_state = nv50_head_atomic_duplicate_state,
  	.atomic_destroy_state = nv50_head_atomic_destroy_state,
 +	.enable_vblank = nouveau_display_vblank_enable,
 +	.disable_vblank = nouveau_display_vblank_disable,
 +	.get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp,
  };
  
- int
+ struct nv50_head *
  nv50_head_create(struct drm_device *dev, int index)
  {
  	struct nouveau_drm *drm = nouveau_drm(dev);
diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 673d6920fc29,827458f49112..cf3dc56d7cf4
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@@ -1391,8 -1399,9 +1399,6 @@@ static const struct file_operations vmw
  static struct drm_driver driver = {
  	.driver_features =
  	DRIVER_MODESET | DRIVER_RENDER | DRIVER_ATOMIC,
- 	.load = vmw_driver_load,
- 	.unload = vmw_driver_unload,
 -	.get_vblank_counter = vmw_get_vblank_counter,
 -	.enable_vblank = vmw_enable_vblank,
 -	.disable_vblank = vmw_disable_vblank,
  	.ioctls = vmw_ioctls,
  	.num_ioctls = ARRAY_SIZE(vmw_ioctls),
  	.master_set = vmw_master_set,
diff --cc drivers/video/fbdev/s1d13xxxfb.c
index c23defa27036,8048499e398d..eaea8c373753
--- a/drivers/video/fbdev/s1d13xxxfb.c
+++ b/drivers/video/fbdev/s1d13xxxfb.c
@@@ -809,8 -809,8 +809,8 @@@ static int s1d13xxxfb_probe(struct plat
  
  	platform_set_drvdata(pdev, info);
  	default_par = info->par;
- 	default_par->regs = ioremap_nocache(pdev->resource[1].start,
- 					    resource_size(&pdev->resource[1]));
+ 	default_par->regs = ioremap(pdev->resource[1].start,
 -			pdev->resource[1].end - pdev->resource[1].start +1);
++				    resource_size(&pdev->resource[1]));
  	if (!default_par->regs) {
  		printk(KERN_ERR PFX "unable to map registers\n");
  		ret = -ENOMEM;
@@@ -818,8 -818,9 +818,9 @@@
  	}
  	info->pseudo_palette = default_par->pseudo_palette;
  
- 	info->screen_base = ioremap_nocache(pdev->resource[0].start,
- 					    resource_size(&pdev->resource[0]));
+ 	info->screen_base = ioremap(pdev->resource[0].start,
 -			pdev->resource[0].end - pdev->resource[0].start +1);
++				    resource_size(&pdev->resource[0]));
+ 
  	if (!info->screen_base) {
  		printk(KERN_ERR PFX "unable to map framebuffer\n");
  		ret = -ENOMEM;