]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'drm-misc-next-2020-02-10' of git://anongit.freedesktop.org/drm/drm-misc...
authorDave Airlie <airlied@redhat.com>
Thu, 20 Feb 2020 05:21:02 +0000 (15:21 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 20 Feb 2020 19:44:40 +0000 (05:44 +1000)
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
22 files changed:
1  2 
Documentation/devicetree/bindings/vendor-prefixes.yaml
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
drivers/gpu/drm/drm_dp_helper.c
drivers/gpu/drm/drm_dp_mst_topology.c
drivers/gpu/drm/i915/display/icl_dsi.c
drivers/gpu/drm/i915/display/intel_display_types.h
drivers/gpu/drm/i915/display/intel_dp.c
drivers/gpu/drm/i915/display/vlv_dsi.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/lima/lima_sched.c
drivers/gpu/drm/nouveau/nouveau_bo.c
drivers/gpu/drm/panfrost/panfrost_job.c
drivers/gpu/drm/panfrost/panfrost_mmu.c
drivers/gpu/drm/radeon/radeon_ttm.c
drivers/video/console/Kconfig
drivers/video/fbdev/hyperv_fb.c
drivers/video/fbdev/pxa168fb.c
drivers/video/fbdev/s1d13xxxfb.c
include/drm/drm_dp_helper.h
include/drm/drm_dp_mst_helper.h

index 9e67944bec9c673a698876647a7ef607d19705fb,ac4804d0a9917d9387e7945b2ebaa397358da842..9a0cca2fd166ca5766f22cea5e62567f540fe367
@@@ -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 MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 8048499e398dd328731187d6bebe8e2ac417ed76,c23defa270369c48e6ea850d4abbb2c9d6200efb..eaea8c37375348a666e6bd60cc9b149cfe88af6e
@@@ -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;
        }
        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;
Simple merge
Simple merge