From: Thomas Zimmermann Date: Tue, 10 Nov 2020 16:11:37 +0000 (+0100) Subject: Merge drm/drm-next into drm-misc-next X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=112e505a76de69f8667e2fe8da38433f754364a8;p=linux.git Merge drm/drm-next into drm-misc-next We need commit f8f6ae5d077a ("mm: always have io_remap_pfn_range() set pgprot_decrypted()") to be able to merge Jason's cleanup patch. Signed-off-by: Thomas Zimmermann --- 112e505a76de69f8667e2fe8da38433f754364a8 diff --cc drivers/gpu/drm/i915/i915_drv.c index b15d206dca3ad,d6e25212d5c05..f2389ba49c69b --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@@ -84,9 -84,10 +84,10 @@@ #include "intel_gvt.h" #include "intel_memory_region.h" #include "intel_pm.h" + #include "intel_sideband.h" #include "vlv_suspend.h" -static struct drm_driver driver; +static const struct drm_driver driver; static int i915_get_bridge_dev(struct drm_i915_private *dev_priv) { diff --cc drivers/gpu/drm/vc4/vc4_drv.h index fe078648e0f51,40f1192fff025..137c382256d5d --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@@ -806,9 -807,8 +807,8 @@@ int vc4_prime_mmap(struct drm_gem_objec struct drm_gem_object *vc4_prime_import_sg_table(struct drm_device *dev, struct dma_buf_attachment *attach, struct sg_table *sgt); -void *vc4_prime_vmap(struct drm_gem_object *obj); +int vc4_prime_vmap(struct drm_gem_object *obj, struct dma_buf_map *map); int vc4_bo_cache_init(struct drm_device *dev); - void vc4_bo_cache_destroy(struct drm_device *dev); int vc4_bo_inc_usecnt(struct vc4_bo *bo); void vc4_bo_dec_usecnt(struct vc4_bo *bo); void vc4_bo_add_to_purgeable_pool(struct vc4_bo *bo);