From: Dave Airlie <airlied@redhat.com>
Date: Thu, 20 Feb 2020 05:21:02 +0000 (+1000)
Subject: Merge tag 'drm-misc-next-2020-02-10' of git://anongit.freedesktop.org/drm/drm-misc... 
X-Git-Tag: v5.10.7~2823^2~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1b245ec5b685ebf8e6e5d1e6b5bcc03b6608e8b0;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'drm-misc-next-2020-02-10' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for 5.7:

UAPI Changes:
  - lima: Add support for heap buffers

Cross-subsystem Changes:

Core Changes:
  - Implement mode_config mode_valid for memory constrained drivers
  - Bus format negociation between bridges
  - Consolidate fake vblank events for drivers without vblank interrupts
  - drm/bufs: dma_alloc related cleanups
  - drm/dp_mst: Various fixes
  - drm/print: New drm_device based print helpers
  - Thomas is a drm-misc maintainer now!

Driver Changes:
  - DPMS cleanups for atomic drivers
  - Removal of owner field in SPI tinydrm drivers
  - Removal of explicit dependency on DT for tinydrm drivers
  - Conversion to YAML schemas for DT bindings
  - tidss: New driver
  - virtio: various reworks and fixes
  - Our usual dozen or so new panels or bridges

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200210093421.xu4sofldm6wm6xq6@gilmour.lan
---

1b245ec5b685ebf8e6e5d1e6b5bcc03b6608e8b0
diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
index 9e67944,ac4804d..9a0cca2
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -553,10 -549,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/video/fbdev/s1d13xxxfb.c
index 8048499,c23defa..eaea8c3
--- 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,9 -818,8 +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;