Merge tag 'drm-misc-next-2017-05-26' of git://anongit.freedesktop.org/git/drm-misc into drm-next

UAPI Changes:
- Add DRM_MODE_ROTATE_ and DRM_MODE_REFLECT_ defines to the UAPI (Robert)

Cross-subsystem Changes:
- Standardize sync_file.txt documentation format (Mauro)

Core Changes:
- Turf drm_[cm]alloc functions for kvmalloc alternatives (Michal)
- Add optional mode_valid() hook to crtc/encoder/bridge (Jose)
- Improve documentation around mode validation/alteration (Daniel)
- Reduce sync_file construction time by deferring name creation (Chris)

Driver Changes:
- pl111: Wire up the clock divider and add debugfs (Eric)
- various: Fix include notation and remove -Iinclude/drm (Masahiro)
- stm: Add Benjamin Gaignard and Vincent Abriou as STM maintainers (Vincent)
- various: Miscellaneous trivial fixes to pl111/stm/vgem/vc4

Cc: Michal Hocko <mhocko@suse.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Robert Foss <robert.foss@collabora.com>
Cc: Vincent Abriou <vincent.abriou@st.com>
Cc: Jose Abreu <Jose.Abreu@synopsys.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mauro Carvalho Chehab <mchehab@s-opensource.com>

* tag 'drm-misc-next-2017-05-26' of git://anongit.freedesktop.org/git/drm-misc: (55 commits)
  dma-buf/sync-file: Defer creation of sync_file->name
  sync_file.txt: standardize document format
  gpu: drm: gma500: remove two more dead variable
  drm/doc: Clarify mode_fixup vs. atomic_check a bit more
  drm/doc: Document adjusted/request modes a bit better
  drm: Add crtc/encoder/bridge->mode_valid() callbacks
  MAINTAINERS: update drm/stm maintainers list
  drm/stm: ltdc: fix duplicated arguments
  drm/pl111: Fix return value check in pl111_amba_probe()
  drm/amd: include <linux/delay.h> instead of "linux/delay.h"
  drm: Add DRM_MODE_ROTATE_ and DRM_MODE_REFLECT_ to UAPI
  drm/vgem: Fix return value check in vgem_init()
  drm/blend: Fix comment typ-o
  drm/stm: remove unneeded -Iinclude/drm compiler flag
  drm/vc4: fix include notation and remove -Iinclude/drm flag
  drm/pl111: Add a debugfs node to dump our registers.
  drm/pl111: make structure mode_config_funcs static
  drm/pl111: make structure pl111_display_funcs static
  drm/pl111: Register the clock divider and use it.
  drm: drop drm_[cm]alloc* helpers
  ...

224 files changed, 1194 insertions, 814 deletions

diff --git a/Documentation/sync_file.txt b/Documentation/sync_file.txt
index c3d033a06e8d..496fb2c3b3e6 100644
--- a/Documentation/sync_file.txt
+++ b/Documentation/sync_file.txt
@@ -1,8 +1,8 @@
-                              Sync File API Guide
-                              ~~~~~~~~~~~~~~~~~~~
+===================
+Sync File API Guide
+===================
 
-                                Gustavo Padovan
-                          <gustavo at padovan dot org>
+:Author: Gustavo Padovan <gustavo at padovan dot org>
 
 This document serves as a guide for device drivers writers on what the
 sync_file API is, and how drivers can support it. Sync file is the carrier of
@@ -46,16 +46,17 @@ Creating Sync Files
 
 When a driver needs to send an out-fence userspace it creates a sync_file.
 
-Interface:
+Interface::
+
         struct sync_file *sync_file_create(struct dma_fence *fence);
 
 The caller pass the out-fence and gets back the sync_file. That is just the
 first step, next it needs to install an fd on sync_file->file. So it gets an
-fd:
+fd::
 
         fd = get_unused_fd_flags(O_CLOEXEC);
 
-and installs it on sync_file->file:
+and installs it on sync_file->file::
 
         fd_install(fd, sync_file->file);
 
@@ -71,7 +72,8 @@ When userspace needs to send an in-fence to the driver it passes file descriptor
 of the Sync File to the kernel. The kernel can then retrieve the fences
 from it.
 
-Interface:
+Interface::
+
         struct dma_fence *sync_file_get_fence(int fd);
 
 
@@ -79,5 +81,6 @@ The returned reference is owned by the caller and must be disposed of
 afterwards using dma_fence_put(). In case of error, a NULL is returned instead.
 
 References:
-[1] struct sync_file in include/linux/sync_file.h
-[2] All interfaces mentioned above defined in include/linux/sync_file.h
+
+1. struct sync_file in include/linux/sync_file.h
+2. All interfaces mentioned above defined in include/linux/sync_file.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 81cdd03a6ad0..757d4877ed69 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4502,6 +4502,8 @@ F:	Documentation/devicetree/bindings/display/st,stih4xx.txt
 DRM DRIVERS FOR STM
 M:      Yannick Fertre <yannick.fertre@st.com>
 M:      Philippe Cornu <philippe.cornu@st.com>
+M:      Benjamin Gaignard <benjamin.gaignard@linaro.org>
+M:      Vincent Abriou <vincent.abriou@st.com>
 L:      dri-devel@lists.freedesktop.org
 T:      git git://anongit.freedesktop.org/drm/drm-misc
 S:      Maintained
diff --git a/drivers/dma-buf/sync_debug.c b/drivers/dma-buf/sync_debug.c
index a0d780ab68c3..82a6e7f6d37f 100644
--- a/drivers/dma-buf/sync_debug.c
+++ b/drivers/dma-buf/sync_debug.c
@@ -132,9 +132,11 @@ static void sync_print_obj(struct seq_file *s, struct sync_timeline *obj)
 static void sync_print_sync_file(struct seq_file *s,
                                   struct sync_file *sync_file)
 {
+        char buf[128];
         int i;
 
-        seq_printf(s, "[%p] %s: %s\n", sync_file, sync_file->name,
+        seq_printf(s, "[%p] %s: %s\n", sync_file,
+                   sync_file_get_name(sync_file, buf, sizeof(buf)),
                    sync_status_str(dma_fence_get_status(sync_file->fence)));
 
         if (dma_fence_is_array(sync_file->fence)) {
diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c
index dc89b1d484e8..545e2c5c4815 100644
--- a/drivers/dma-buf/sync_file.c
+++ b/drivers/dma-buf/sync_file.c
@@ -80,11 +80,6 @@ struct sync_file *sync_file_create(struct dma_fence *fence)
 
         sync_file->fence = dma_fence_get(fence);
 
-        snprintf(sync_file->name, sizeof(sync_file->name), "%s-%s%llu-%d",
-                 fence->ops->get_driver_name(fence),
-                 fence->ops->get_timeline_name(fence), fence->context,
-                 fence->seqno);
-
         return sync_file;
 }
 EXPORT_SYMBOL(sync_file_create);
@@ -129,6 +124,36 @@ struct dma_fence *sync_file_get_fence(int fd)
 }
 EXPORT_SYMBOL(sync_file_get_fence);
 
+/**
+ * sync_file_get_name - get the name of the sync_file
+ * @sync_file:          sync_file to get the fence from
+ * @buf:                destination buffer to copy sync_file name into
+ * @len:                available size of destination buffer.
+ *
+ * Each sync_file may have a name assigned either by the user (when merging
+ * sync_files together) or created from the fence it contains. In the latter
+ * case construction of the name is deferred until use, and so requires
+ * sync_file_get_name().
+ *
+ * Returns: a string representing the name.
+ */
+char *sync_file_get_name(struct sync_file *sync_file, char *buf, int len)
+{
+        if (sync_file->user_name[0]) {
+                strlcpy(buf, sync_file->user_name, len);
+        } else {
+                struct dma_fence *fence = sync_file->fence;
+
+                snprintf(buf, len, "%s-%s%llu-%d",
+                         fence->ops->get_driver_name(fence),
+                         fence->ops->get_timeline_name(fence),
+                         fence->context,
+                         fence->seqno);
+        }
+
+        return buf;
+}
+
 static int sync_file_set_fence(struct sync_file *sync_file,
                                struct dma_fence **fences, int num_fences)
 {
@@ -266,7 +291,7 @@ static struct sync_file *sync_file_merge(const char *name, struct sync_file *a,
                 goto err;
         }
 
-        strlcpy(sync_file->name, name, sizeof(sync_file->name));
+        strlcpy(sync_file->user_name, name, sizeof(sync_file->user_name));
         return sync_file;
 
 err:
@@ -413,7 +438,7 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file,
         }
 
 no_fences:
-        strlcpy(info.name, sync_file->name, sizeof(info.name));
+        sync_file_get_name(sync_file, info.name, sizeof(info.name));
         info.status = dma_fence_is_signaled(sync_file->fence);
         info.num_fences = num_fences;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile
index 660786aba7d2..20bde726419e 100644
--- a/drivers/gpu/drm/amd/amdgpu/Makefile
+++ b/drivers/gpu/drm/amd/amdgpu/Makefile
@@ -4,7 +4,7 @@
 
 FULL_AMD_PATH=$(src)/..
 
-ccflags-y := -Iinclude/drm -I$(FULL_AMD_PATH)/include/asic_reg \
+ccflags-y := -I$(FULL_AMD_PATH)/include/asic_reg \
         -I$(FULL_AMD_PATH)/include \
         -I$(FULL_AMD_PATH)/amdgpu \
         -I$(FULL_AMD_PATH)/scheduler \
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 67cdab9241a4..77ff68f9932b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -36,11 +36,11 @@
 #include <linux/hashtable.h>
 #include <linux/dma-fence.h>
 
-#include <ttm/ttm_bo_api.h>
-#include <ttm/ttm_bo_driver.h>
-#include <ttm/ttm_placement.h>
-#include <ttm/ttm_module.h>
-#include <ttm/ttm_execbuf_util.h>
+#include <drm/ttm/ttm_bo_api.h>
+#include <drm/ttm/ttm_bo_driver.h>
+#include <drm/ttm/ttm_placement.h>
+#include <drm/ttm/ttm_module.h>
+#include <drm/ttm/ttm_execbuf_util.h>
 
 #include <drm/drmP.h>
 #include <drm/drm_gem.h>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
index a6649874e6ce..9f0247cdda5e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
@@ -96,7 +96,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev,
         int r;
         unsigned long total_size = 0;
 
-        array = drm_malloc_ab(num_entries, sizeof(struct amdgpu_bo_list_entry));
+        array = kvmalloc_array(num_entries, sizeof(struct amdgpu_bo_list_entry), GFP_KERNEL);
         if (!array)
                 return -ENOMEM;
         memset(array, 0, num_entries * sizeof(struct amdgpu_bo_list_entry));
@@ -148,7 +148,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev,
         for (i = 0; i < list->num_entries; ++i)
                 amdgpu_bo_unref(&list->array[i].robj);
 
-        drm_free_large(list->array);
+        kvfree(list->array);
 
         list->gds_obj = gds_obj;
         list->gws_obj = gws_obj;
@@ -163,7 +163,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev,
 error_free:
         while (i--)
                 amdgpu_bo_unref(&array[i].robj);
-        drm_free_large(array);
+        kvfree(array);
         return r;
 }
 
@@ -224,7 +224,7 @@ void amdgpu_bo_list_free(struct amdgpu_bo_list *list)
                 amdgpu_bo_unref(&list->array[i].robj);
 
         mutex_destroy(&list->lock);
-        drm_free_large(list->array);
+        kvfree(list->array);
         kfree(list);
 }
 
@@ -244,8 +244,8 @@ int amdgpu_bo_list_ioctl(struct drm_device *dev, void *data,
 
         int r;
 
-        info = drm_malloc_ab(args->in.bo_number,
-                             sizeof(struct drm_amdgpu_bo_list_entry));
+        info = kvmalloc_array(args->in.bo_number,
+                             sizeof(struct drm_amdgpu_bo_list_entry), GFP_KERNEL);
         if (!info)
                 return -ENOMEM;
 
@@ -311,11 +311,11 @@ int amdgpu_bo_list_ioctl(struct drm_device *dev, void *data,
 
         memset(args, 0, sizeof(*args));
         args->out.list_handle = handle;
-        drm_free_large(info);
+        kvfree(info);
 
         return 0;
 
 error_free:
-        drm_free_large(info);
+        kvfree(info);
         return r;
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 4e6b9501ab0a..5b3e0f63a115 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -194,7 +194,7 @@ int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data)
                 size = p->chunks[i].length_dw;
                 cdata = (void __user *)(uintptr_t)user_chunk.chunk_data;
 
-                p->chunks[i].kdata = drm_malloc_ab(size, sizeof(uint32_t));
+                p->chunks[i].kdata = kvmalloc_array(size, sizeof(uint32_t), GFP_KERNEL);
                 if (p->chunks[i].kdata == NULL) {
                         ret = -ENOMEM;
                         i--;
@@ -247,7 +247,7 @@ free_all_kdata:
         i = p->nchunks - 1;
 free_partial_kdata:
         for (; i >= 0; i--)
-                drm_free_large(p->chunks[i].kdata);
+                kvfree(p->chunks[i].kdata);
         kfree(p->chunks);
         p->chunks = NULL;
         p->nchunks = 0;
@@ -505,7 +505,7 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,
                         return r;
 
                 if (binding_userptr) {
-                        drm_free_large(lobj->user_pages);
+                        kvfree(lobj->user_pages);
                         lobj->user_pages = NULL;
                 }
         }
@@ -571,7 +571,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
                                 release_pages(e->user_pages,
                                               e->robj->tbo.ttm->num_pages,
                                               false);
-                                drm_free_large(e->user_pages);
+                                kvfree(e->user_pages);
                                 e->user_pages = NULL;
                         }
 
@@ -601,8 +601,9 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
                 list_for_each_entry(e, &need_pages, tv.head) {
                         struct ttm_tt *ttm = e->robj->tbo.ttm;
 
-                        e->user_pages = drm_calloc_large(ttm->num_pages,
-                                                         sizeof(struct page*));
+                        e->user_pages = kvmalloc_array(ttm->num_pages,
+                                                         sizeof(struct page*),
+                                                         GFP_KERNEL | __GFP_ZERO);
                         if (!e->user_pages) {
                                 r = -ENOMEM;
                                 DRM_ERROR("calloc failure in %s\n", __func__);
@@ -612,7 +613,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
                         r = amdgpu_ttm_tt_get_user_pages(ttm, e->user_pages);
                         if (r) {
                                 DRM_ERROR("amdgpu_ttm_tt_get_user_pages failed.\n");
-                                drm_free_large(e->user_pages);
+                                kvfree(e->user_pages);
                                 e->user_pages = NULL;
                                 goto error_free_pages;
                         }
@@ -708,7 +709,7 @@ error_free_pages:
                         release_pages(e->user_pages,
                                       e->robj->tbo.ttm->num_pages,
                                       false);
-                        drm_free_large(e->user_pages);
+                        kvfree(e->user_pages);
                 }
         }
 
@@ -761,7 +762,7 @@ static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser, int error, bo
                 amdgpu_bo_list_put(parser->bo_list);
 
         for (i = 0; i < parser->nchunks; i++)
-                drm_free_large(parser->chunks[i].kdata);
+                kvfree(parser->chunks[i].kdata);
         kfree(parser->chunks);
         if (parser->job)
                 amdgpu_job_free(parser->job);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c
index 38e9b0d3659a..1cb52fd19060 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_atombios.h"
 #include "amdgpu_i2c.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 5cb8f3e68447..31eddd85eb40 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -39,7 +39,7 @@
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/vga_switcheroo.h>
-#include "drm_crtc_helper.h"
+#include <drm/drm_crtc_helper.h>
 
 #include "amdgpu.h"
 #include "amdgpu_irq.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index ac5e92e5d59d..596e3957bdd9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -24,7 +24,7 @@
  */
 
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_psp.h"
 #include "amdgpu_ucode.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 5db0230e45c6..b5fa003c1341 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -29,11 +29,11 @@
  *    Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
  *    Dave Airlie
  */
-#include <ttm/ttm_bo_api.h>
-#include <ttm/ttm_bo_driver.h>
-#include <ttm/ttm_placement.h>
-#include <ttm/ttm_module.h>
-#include <ttm/ttm_page_alloc.h>
+#include <drm/ttm/ttm_bo_api.h>
+#include <drm/ttm/ttm_bo_driver.h>
+#include <drm/ttm/ttm_placement.h>
+#include <drm/ttm/ttm_module.h>
+#include <drm/ttm/ttm_page_alloc.h>
 #include <drm/drmP.h>
 #include <drm/amdgpu_drm.h>
 #include <linux/seq_file.h>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 07ff3b1514f1..749a6cde7985 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -279,8 +279,9 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev,
         if (!parent->entries) {
                 unsigned num_entries = amdgpu_vm_num_entries(adev, level);
 
-                parent->entries = drm_calloc_large(num_entries,
-                                                   sizeof(struct amdgpu_vm_pt));
+                parent->entries = kvmalloc_array(num_entries,
+                                                   sizeof(struct amdgpu_vm_pt),
+                                                   GFP_KERNEL | __GFP_ZERO);
                 if (!parent->entries)
                         return -ENOMEM;
                 memset(parent->entries, 0 , sizeof(struct amdgpu_vm_pt));
@@ -2198,7 +2199,7 @@ static void amdgpu_vm_free_levels(struct amdgpu_vm_pt *level)
                 for (i = 0; i <= level->last_entry_used; i++)
                         amdgpu_vm_free_levels(&level->entries[i]);
 
-        drm_free_large(level->entries);
+        kvfree(level->entries);
 }
 
 /**
diff --git a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
index 6dc1410b380f..00e56a28b593 100644
--- a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
@@ -22,7 +22,7 @@
  */
 
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_ucode.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/ci_smc.c b/drivers/gpu/drm/amd/amdgpu/ci_smc.c
index 7eb9069db8e3..b8ba51e045b5 100644
--- a/drivers/gpu/drm/amd/amdgpu/ci_smc.c
+++ b/drivers/gpu/drm/amd/amdgpu/ci_smc.c
@@ -23,7 +23,7 @@
  */
 
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "cikd.h"
 #include "ppsmc.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index 9d33e5641419..6b2034533f68 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -24,7 +24,7 @@
 #include <linux/firmware.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_atombios.h"
 #include "amdgpu_ih.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/cik_ih.c b/drivers/gpu/drm/amd/amdgpu/cik_ih.c
index c57c3f18af01..b8918432c572 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik_ih.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "cikd.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/cz_ih.c b/drivers/gpu/drm/amd/amdgpu/cz_ih.c
index a5f294ebff5c..0c1209cdd1cb 100644
--- a/drivers/gpu/drm/amd/amdgpu/cz_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/cz_ih.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "vid.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index 0cdeb6a2e4a0..3c62c45f43a1 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_i2c.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index 773654a19749..c8ed0facddcd 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_i2c.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
index 1f3552967ba3..3f3a25493327 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_i2c.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
index 3c558c170e5e..3e90c19b9c7f 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_i2c.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
index f1b479b6ac98..90bb08309a53 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_i2c.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
index ee2f2139e2eb..f7414cabd4ff 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
@@ -21,7 +21,7 @@
  *
  */
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "amdgpu_gfx.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 758d636a6f52..404d12785853 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -21,7 +21,7 @@
  *
  */
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_gfx.h"
 #include "vi.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 0c16b7563b73..125b11950071 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -21,7 +21,7 @@
  *
  */
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_gfx.h"
 #include "soc15.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
index a572979f186c..2a3983036a30 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
@@ -21,7 +21,7 @@
  *
  */
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "gmc_v6_0.h"
 #include "amdgpu_ucode.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
index a9083a16a250..6d347c1d2516 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
@@ -21,7 +21,7 @@
  *
  */
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "cikd.h"
 #include "cik.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
index 4ac99784160a..2784ff49cf56 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
@@ -21,7 +21,7 @@
  *
  */
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "gmc_v8_0.h"
 #include "amdgpu_ucode.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_ih.c b/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
index cb622add99a7..7a0ea27ac429 100644
--- a/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "vid.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
index 79a52ad2c80d..3bbf2ccfca89 100644
--- a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "cikd.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/kv_smc.c b/drivers/gpu/drm/amd/amdgpu/kv_smc.c
index e6b7b42acfe1..b82e33c01571 100644
--- a/drivers/gpu/drm/amd/amdgpu/kv_smc.c
+++ b/drivers/gpu/drm/amd/amdgpu/kv_smc.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "cikd.h"
 #include "kv_dpm.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
index 60a6407ba267..eef89abc0cee 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
@@ -24,7 +24,7 @@
  */
 
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_psp.h"
 #include "amdgpu_ucode.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
index c0b1aabf282f..2431639baf47 100644
--- a/drivers/gpu/drm/amd/amdgpu/si.c
+++ b/drivers/gpu/drm/amd/amdgpu/si.c
@@ -24,7 +24,7 @@
 #include <linux/firmware.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_atombios.h"
 #include "amdgpu_ih.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/si_dpm.c b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
index 7c1c5d127281..a7ad8390981c 100644
--- a/drivers/gpu/drm/amd/amdgpu/si_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_dpm.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/si_ih.c b/drivers/gpu/drm/amd/amdgpu/si_ih.c
index e66084211c74..ce25e03a077d 100644
--- a/drivers/gpu/drm/amd/amdgpu/si_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_ih.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "sid.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/si_smc.c b/drivers/gpu/drm/amd/amdgpu/si_smc.c
index 0726bc3b6f90..4a2fd8b61940 100644
--- a/drivers/gpu/drm/amd/amdgpu/si_smc.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_smc.c
@@ -23,7 +23,7 @@
  */
 
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "sid.h"
 #include "ppsmc.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 6b55d451ae7f..e945f8b07487 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -23,7 +23,7 @@
 #include <linux/firmware.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_atomfirmware.h"
 #include "amdgpu_ih.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/tonga_ih.c b/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
index 3a5097ac2bb4..923df2c0e535 100644
--- a/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "vid.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
index 071f56e439bb..3b9740fb2c41 100644
--- a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "soc15.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index b1132f5e84fc..3a187619286f 100644
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -21,7 +21,7 @@
  *
  */
 #include <linux/slab.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_atombios.h"
 #include "amdgpu_ih.h"
diff --git a/drivers/gpu/drm/amd/amdkfd/Makefile b/drivers/gpu/drm/amd/amdkfd/Makefile
index 7fc9b0f444cb..b400d5664252 100644
--- a/drivers/gpu/drm/amd/amdkfd/Makefile
+++ b/drivers/gpu/drm/amd/amdkfd/Makefile
@@ -2,7 +2,7 @@
 # Makefile for Heterogenous System Architecture support for AMD GPU devices
 #
 
-ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/amd/include/  \
+ccflags-y := -Idrivers/gpu/drm/amd/include/  \
                 -Idrivers/gpu/drm/amd/include/asic_reg
 
 amdkfd-y        := kfd_module.o kfd_device.o kfd_chardev.o kfd_topology.o \
diff --git a/drivers/gpu/drm/amd/powerplay/Makefile b/drivers/gpu/drm/amd/powerplay/Makefile
index 043e6ebab575..4e132b936e3d 100644
--- a/drivers/gpu/drm/amd/powerplay/Makefile
+++ b/drivers/gpu/drm/amd/powerplay/Makefile
@@ -1,5 +1,5 @@
 
-subdir-ccflags-y += -Iinclude/drm  \
+subdir-ccflags-y += \
                 -I$(FULL_AMD_PATH)/powerplay/inc/  \
                 -I$(FULL_AMD_PATH)/include/asic_reg  \
                 -I$(FULL_AMD_PATH)/include  \
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
index ff4ae3de6bb6..963a9e017a28 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
@@ -22,10 +22,10 @@
  */
 
 #include "pp_debug.h"
-#include "linux/delay.h"
-#include <linux/types.h>
+#include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/types.h>
 #include <drm/amdgpu_drm.h>
 #include "cgs_common.h"
 #include "power_state.h"
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c
index f5e8fda964f7..f6b4dd96c0ec 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c
@@ -21,8 +21,8 @@
  *
  */
 
+#include <linux/delay.h>
 #include <linux/errno.h>
-#include "linux/delay.h"
 #include "hwmgr.h"
 #include "amd_acpi.h"
 #include "pp_acpi.h"
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
index a74a3db3056c..975567f6813d 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
@@ -21,11 +21,11 @@
  *
  */
 #include "pp_debug.h"
+#include <linux/delay.h>
+#include <linux/fb.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/fb.h>
 #include <asm/div64.h>
-#include "linux/delay.h"
 #include "pp_acpi.h"
 #include "ppatomctrl.h"
 #include "atombios.h"
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
index ad30f5d3a10d..cd7bf6d3859a 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
@@ -20,10 +20,11 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
+
+#include <linux/delay.h>
+#include <linux/fb.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/fb.h>
-#include "linux/delay.h"
 
 #include "hwmgr.h"
 #include "amd_powerplay.h"
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c
index 1f6744a443d4..39c7091866e8 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c
@@ -20,11 +20,13 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include <linux/types.h>
+
+#include <linux/delay.h>
+#include <linux/gfp.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
-#include <linux/gfp.h>
-#include "linux/delay.h"
+#include <linux/types.h>
+
 #include "cgs_common.h"
 #include "smu/smu_8_0_d.h"
 #include "smu/smu_8_0_sh_mask.h"
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
index c0d75766bbc8..2e954a44bac1 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
@@ -20,15 +20,16 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include <linux/types.h>
+
+#include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/types.h>
 #include <drm/amdgpu_drm.h>
 #include "pp_instance.h"
 #include "smumgr.h"
 #include "cgs_common.h"
-#include "linux/delay.h"
 
 MODULE_FIRMWARE("amdgpu/topaz_smc.bin");
 MODULE_FIRMWARE("amdgpu/topaz_k_smc.bin");
diff --git a/drivers/gpu/drm/arm/malidp_drv.h b/drivers/gpu/drm/arm/malidp_drv.h
index 040311ffcaec..2e2033140efc 100644
--- a/drivers/gpu/drm/arm/malidp_drv.h
+++ b/drivers/gpu/drm/arm/malidp_drv.h
@@ -65,6 +65,6 @@ void malidp_de_planes_destroy(struct drm_device *drm);
 int malidp_crtc_init(struct drm_device *drm);
 
 /* often used combination of rotational bits */
-#define MALIDP_ROTATED_MASK     (DRM_ROTATE_90 | DRM_ROTATE_270)
+#define MALIDP_ROTATED_MASK     (DRM_MODE_ROTATE_90 | DRM_MODE_ROTATE_270)
 
 #endif  /* __MALIDP_DRV_H__ */
diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c
index 814fda23cead..063a8d2b0be3 100644
--- a/drivers/gpu/drm/arm/malidp_planes.c
+++ b/drivers/gpu/drm/arm/malidp_planes.c
@@ -80,7 +80,7 @@ static void malidp_plane_reset(struct drm_plane *plane)
         state = kzalloc(sizeof(*state), GFP_KERNEL);
         if (state) {
                 state->base.plane = plane;
-                state->base.rotation = DRM_ROTATE_0;
+                state->base.rotation = DRM_MODE_ROTATE_0;
                 plane->state = &state->base;
         }
 }
@@ -221,7 +221,7 @@ static int malidp_de_plane_check(struct drm_plane *plane,
                 return ret;
 
         /* packed RGB888 / BGR888 can't be rotated or flipped */
-        if (state->rotation != DRM_ROTATE_0 &&
+        if (state->rotation != DRM_MODE_ROTATE_0 &&
             (fb->format->format == DRM_FORMAT_RGB888 ||
              fb->format->format == DRM_FORMAT_BGR888))
                 return -EINVAL;
@@ -315,12 +315,12 @@ static void malidp_de_plane_update(struct drm_plane *plane,
         val &= ~LAYER_ROT_MASK;
 
         /* setup the rotation and axis flip bits */
-        if (plane->state->rotation & DRM_ROTATE_MASK)
-                val |= ilog2(plane->state->rotation & DRM_ROTATE_MASK) <<
+        if (plane->state->rotation & DRM_MODE_ROTATE_MASK)
+                val |= ilog2(plane->state->rotation & DRM_MODE_ROTATE_MASK) <<
                        LAYER_ROT_OFFSET;
-        if (plane->state->rotation & DRM_REFLECT_X)
+        if (plane->state->rotation & DRM_MODE_REFLECT_X)
                 val |= LAYER_H_FLIP;
-        if (plane->state->rotation & DRM_REFLECT_Y)
+        if (plane->state->rotation & DRM_MODE_REFLECT_Y)
                 val |= LAYER_V_FLIP;
 
         /*
@@ -370,8 +370,8 @@ int malidp_de_planes_init(struct drm_device *drm)
         struct malidp_plane *plane = NULL;
         enum drm_plane_type plane_type;
         unsigned long crtcs = 1 << drm->mode_config.num_crtc;
-        unsigned long flags = DRM_ROTATE_0 | DRM_ROTATE_90 | DRM_ROTATE_180 |
-                              DRM_ROTATE_270 | DRM_REFLECT_X | DRM_REFLECT_Y;
+        unsigned long flags = DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_90 | DRM_MODE_ROTATE_180 |
+                              DRM_MODE_ROTATE_270 | DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y;
         u32 *formats;
         int ret, i, j, n;
 
@@ -420,7 +420,7 @@ int malidp_de_planes_init(struct drm_device *drm)
                         continue;
                 }
 
-                drm_plane_create_rotation_property(&plane->base, DRM_ROTATE_0, flags);
+                drm_plane_create_rotation_property(&plane->base, DRM_MODE_ROTATE_0, flags);
                 malidp_hw_write(malidp->dev, MALIDP_ALPHA_LUT,
                                 plane->layer->base + MALIDP_LAYER_COMPOSE);
         }
diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c
index 424e465ff407..e9a29df4b443 100644
--- a/drivers/gpu/drm/armada/armada_overlay.c
+++ b/drivers/gpu/drm/armada/armada_overlay.c
@@ -125,7 +125,7 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
                                  src_x, src_y, src_w, src_h);
 
         ret = drm_plane_helper_check_update(plane, crtc, fb, &src, &dest, &clip,
-                                            DRM_ROTATE_0,
+                                            DRM_MODE_ROTATE_0,
                                             0, INT_MAX, true, false, &visible);
         if (ret)
                 return ret;
diff --git a/drivers/gpu/drm/ast/Makefile b/drivers/gpu/drm/ast/Makefile
index 171aa0622b66..617fdd39519c 100644
--- a/drivers/gpu/drm/ast/Makefile
+++ b/drivers/gpu/drm/ast/Makefile
@@ -2,8 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y := -Iinclude/drm
-
 ast-y := ast_drv.o ast_main.o ast_mode.o ast_fb.o ast_ttm.o ast_post.o ast_dp501.o
 
 obj-$(CONFIG_DRM_AST) := ast.o
diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c
index e879496b8a42..58084985e6cf 100644
--- a/drivers/gpu/drm/ast/ast_ttm.c
+++ b/drivers/gpu/drm/ast/ast_ttm.c
@@ -26,8 +26,9 @@
  * Authors: Dave Airlie <airlied@redhat.com>
  */
 #include <drm/drmP.h>
+#include <drm/ttm/ttm_page_alloc.h>
+
 #include "ast_drv.h"
-#include <ttm/ttm_page_alloc.h>
 
 static inline struct ast_private *
 ast_bdev(struct ttm_bo_device *bd)
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
index 29cc10d053eb..1124200bb280 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
@@ -678,8 +678,8 @@ static int atmel_hlcdc_plane_atomic_check(struct drm_plane *p,
                 if (!state->bpp[i])
                         return -EINVAL;
 
-                switch (state->base.rotation & DRM_ROTATE_MASK) {
-                case DRM_ROTATE_90:
+                switch (state->base.rotation & DRM_MODE_ROTATE_MASK) {
+                case DRM_MODE_ROTATE_90:
                         offset = ((y_offset + state->src_y + patched_src_w - 1) /
                                   ydiv) * fb->pitches[i];
                         offset += ((x_offset + state->src_x) / xdiv) *
@@ -688,7 +688,7 @@ static int atmel_hlcdc_plane_atomic_check(struct drm_plane *p,
                                           fb->pitches[i];
                         state->pstride[i] = -fb->pitches[i] - state->bpp[i];
                         break;
-                case DRM_ROTATE_180:
+                case DRM_MODE_ROTATE_180:
                         offset = ((y_offset + state->src_y + patched_src_h - 1) /
                                   ydiv) * fb->pitches[i];
                         offset += ((x_offset + state->src_x + patched_src_w - 1) /
@@ -697,7 +697,7 @@ static int atmel_hlcdc_plane_atomic_check(struct drm_plane *p,
                                            state->bpp[i]) - fb->pitches[i];
                         state->pstride[i] = -2 * state->bpp[i];
                         break;
-                case DRM_ROTATE_270:
+                case DRM_MODE_ROTATE_270:
                         offset = ((y_offset + state->src_y) / ydiv) *
                                  fb->pitches[i];
                         offset += ((x_offset + state->src_x + patched_src_h - 1) /
@@ -707,7 +707,7 @@ static int atmel_hlcdc_plane_atomic_check(struct drm_plane *p,
                                           (2 * state->bpp[i]);
                         state->pstride[i] = fb->pitches[i] - state->bpp[i];
                         break;
-                case DRM_ROTATE_0:
+                case DRM_MODE_ROTATE_0:
                 default:
                         offset = ((y_offset + state->src_y) / ydiv) *
                                  fb->pitches[i];
@@ -864,11 +864,11 @@ static int atmel_hlcdc_plane_init_properties(struct atmel_hlcdc_plane *plane,
                 int ret;
 
                 ret = drm_plane_create_rotation_property(&plane->base,
-                                                         DRM_ROTATE_0,
-                                                         DRM_ROTATE_0 |
-                                                         DRM_ROTATE_90 |
-                                                         DRM_ROTATE_180 |
-                                                         DRM_ROTATE_270);
+                                                         DRM_MODE_ROTATE_0,
+                                                         DRM_MODE_ROTATE_0 |
+                                                         DRM_MODE_ROTATE_90 |
+                                                         DRM_MODE_ROTATE_180 |
+                                                         DRM_MODE_ROTATE_270);
                 if (ret)
                         return ret;
         }
diff --git a/drivers/gpu/drm/bochs/Makefile b/drivers/gpu/drm/bochs/Makefile
index 844a55614920..98ef60a19e8f 100644
--- a/drivers/gpu/drm/bochs/Makefile
+++ b/drivers/gpu/drm/bochs/Makefile
@@ -1,4 +1,3 @@
-ccflags-y := -Iinclude/drm
 bochs-drm-y := bochs_drv.o bochs_mm.o bochs_kms.o bochs_fbdev.o bochs_hw.o
 
 obj-$(CONFIG_DRM_BOCHS) += bochs-drm.o
diff --git a/drivers/gpu/drm/bochs/bochs.h b/drivers/gpu/drm/bochs/bochs.h
index f626bab7f5e3..76c490c3cdbc 100644
--- a/drivers/gpu/drm/bochs/bochs.h
+++ b/drivers/gpu/drm/bochs/bochs.h
@@ -9,8 +9,8 @@
 
 #include <drm/drm_gem.h>
 
-#include <ttm/ttm_bo_driver.h>
-#include <ttm/ttm_page_alloc.h>
+#include <drm/ttm/ttm_bo_driver.h>
+#include <drm/ttm/ttm_page_alloc.h>
 
 /* ---------------------------------------------------------------------- */
 
diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
index 3fe2226ee2f2..defcf1e7ca1c 100644
--- a/drivers/gpu/drm/bridge/Makefile
+++ b/drivers/gpu/drm/bridge/Makefile
@@ -1,5 +1,3 @@
-ccflags-y := -Iinclude/drm
-
 obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o
 obj-$(CONFIG_DRM_DUMB_VGA_DAC) += dumb-vga-dac.o
 obj-$(CONFIG_DRM_LVDS_ENCODER) += lvds-encoder.o
diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c
index 351704390d02..4f64e717e01b 100644
--- a/drivers/gpu/drm/bridge/nxp-ptn3460.c
+++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c
@@ -20,15 +20,13 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
-
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_edid.h>
 #include <drm/drm_of.h>
 #include <drm/drm_panel.h>
-
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
-#include "drm_atomic_helper.h"
-#include "drm_edid.h"
-#include "drmP.h"
+#include <drm/drmP.h>
 
 #define PTN3460_EDID_ADDR                       0x0
 #define PTN3460_EDID_EMULATION_ADDR             0x84
diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c
index 1dcec3b97e67..6f22f9fec9bf 100644
--- a/drivers/gpu/drm/bridge/parade-ps8622.c
+++ b/drivers/gpu/drm/bridge/parade-ps8622.c
@@ -24,14 +24,12 @@
 #include <linux/of_device.h>
 #include <linux/pm.h>
 #include <linux/regulator/consumer.h>
-
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
 #include <drm/drm_of.h>
 #include <drm/drm_panel.h>
-
-#include "drmP.h"
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
-#include "drm_atomic_helper.h"
+#include <drm/drmP.h>
 
 /* Brightness scale on the Parade chip */
 #define PS8622_MAX_BRIGHTNESS 0xff
diff --git a/drivers/gpu/drm/cirrus/Makefile b/drivers/gpu/drm/cirrus/Makefile
index 69ffe7006d55..919c0a336c97 100644
--- a/drivers/gpu/drm/cirrus/Makefile
+++ b/drivers/gpu/drm/cirrus/Makefile
@@ -1,4 +1,3 @@
-ccflags-y := -Iinclude/drm
 cirrus-y  := cirrus_main.o cirrus_mode.o \
         cirrus_drv.o cirrus_fbdev.o cirrus_ttm.o
 
diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c b/drivers/gpu/drm/cirrus/cirrus_ttm.c
index 93dbcd38355d..1ff1838c0d44 100644
--- a/drivers/gpu/drm/cirrus/cirrus_ttm.c
+++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c
@@ -26,8 +26,9 @@
  * Authors: Dave Airlie <airlied@redhat.com>
  */
 #include <drm/drmP.h>
+#include <drm/ttm/ttm_page_alloc.h>
+
 #include "cirrus_drv.h"
-#include <ttm/ttm_page_alloc.h>
 
 static inline struct cirrus_device *
 cirrus_bdev(struct ttm_bo_device *bd)
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index cdec19a86af3..e1637011e18a 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -781,7 +781,7 @@ int drm_atomic_plane_set_property(struct drm_plane *plane,
         } else if (property == config->prop_src_h) {
                 state->src_h = val;
         } else if (property == plane->rotation_property) {
-                if (!is_power_of_2(val & DRM_ROTATE_MASK))
+                if (!is_power_of_2(val & DRM_MODE_ROTATE_MASK))
                         return -EINVAL;
                 state->rotation = val;
         } else if (property == plane->zpos_property) {
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 6426339427a4..636e561486a8 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -3225,7 +3225,7 @@ void drm_atomic_helper_plane_reset(struct drm_plane *plane)
 
         if (plane->state) {
                 plane->state->plane = plane;
-                plane->state->rotation = DRM_ROTATE_0;
+                plane->state->rotation = DRM_MODE_ROTATE_0;
         }
 }
 EXPORT_SYMBOL(drm_atomic_helper_plane_reset);
diff --git a/drivers/gpu/drm/drm_blend.c b/drivers/gpu/drm/drm_blend.c
index a0d0d6843288..db6aeec50b82 100644
--- a/drivers/gpu/drm/drm_blend.c
+++ b/drivers/gpu/drm/drm_blend.c
@@ -119,17 +119,17 @@
  * drm_property_create_bitmask()) called "rotation" and has the following
  * bitmask enumaration values:
  *
- * DRM_ROTATE_0:
+ * DRM_MODE_ROTATE_0:
  *      "rotate-0"
- * DRM_ROTATE_90:
+ * DRM_MODE_ROTATE_90:
  *      "rotate-90"
- * DRM_ROTATE_180:
+ * DRM_MODE_ROTATE_180:
  *      "rotate-180"
- * DRM_ROTATE_270:
+ * DRM_MODE_ROTATE_270:
  *      "rotate-270"
- * DRM_REFLECT_X:
+ * DRM_MODE_REFLECT_X:
  *      "reflect-x"
- * DRM_REFELCT_Y:
+ * DRM_MODE_REFLECT_Y:
  *      "reflect-y"
  *
  * Rotation is the specified amount in degrees in counter clockwise direction,
@@ -142,17 +142,17 @@ int drm_plane_create_rotation_property(struct drm_plane *plane,
                                        unsigned int supported_rotations)
 {
         static const struct drm_prop_enum_list props[] = {
-                { __builtin_ffs(DRM_ROTATE_0) - 1,   "rotate-0" },
-                { __builtin_ffs(DRM_ROTATE_90) - 1,  "rotate-90" },
-                { __builtin_ffs(DRM_ROTATE_180) - 1, "rotate-180" },
-                { __builtin_ffs(DRM_ROTATE_270) - 1, "rotate-270" },
-                { __builtin_ffs(DRM_REFLECT_X) - 1,  "reflect-x" },
-                { __builtin_ffs(DRM_REFLECT_Y) - 1,  "reflect-y" },
+                { __builtin_ffs(DRM_MODE_ROTATE_0) - 1,   "rotate-0" },
+                { __builtin_ffs(DRM_MODE_ROTATE_90) - 1,  "rotate-90" },
+                { __builtin_ffs(DRM_MODE_ROTATE_180) - 1, "rotate-180" },
+                { __builtin_ffs(DRM_MODE_ROTATE_270) - 1, "rotate-270" },
+                { __builtin_ffs(DRM_MODE_REFLECT_X) - 1,  "reflect-x" },
+                { __builtin_ffs(DRM_MODE_REFLECT_Y) - 1,  "reflect-y" },
         };
         struct drm_property *prop;
 
-        WARN_ON((supported_rotations & DRM_ROTATE_MASK) == 0);
-        WARN_ON(!is_power_of_2(rotation & DRM_ROTATE_MASK));
+        WARN_ON((supported_rotations & DRM_MODE_ROTATE_MASK) == 0);
+        WARN_ON(!is_power_of_2(rotation & DRM_MODE_ROTATE_MASK));
         WARN_ON(rotation & ~supported_rotations);
 
         prop = drm_property_create_bitmask(plane->dev, 0, "rotation",
@@ -178,14 +178,14 @@ EXPORT_SYMBOL(drm_plane_create_rotation_property);
  * @supported_rotations: Supported rotations
  *
  * Attempt to simplify the rotation to a form that is supported.
- * Eg. if the hardware supports everything except DRM_REFLECT_X
+ * Eg. if the hardware supports everything except DRM_MODE_REFLECT_X
  * one could call this function like this:
  *
- * drm_rotation_simplify(rotation, DRM_ROTATE_0 |
- *                       DRM_ROTATE_90 | DRM_ROTATE_180 |
- *                       DRM_ROTATE_270 | DRM_REFLECT_Y);
+ * drm_rotation_simplify(rotation, DRM_MODE_ROTATE_0 |
+ *                       DRM_MODE_ROTATE_90 | DRM_MODE_ROTATE_180 |
+ *                       DRM_MODE_ROTATE_270 | DRM_MODE_REFLECT_Y);
  *
- * to eliminate the DRM_ROTATE_X flag. Depending on what kind of
+ * to eliminate the DRM_MODE_ROTATE_X flag. Depending on what kind of
  * transforms the hardware supports, this function may not
  * be able to produce a supported transform, so the caller should
  * check the result afterwards.
@@ -194,9 +194,10 @@ unsigned int drm_rotation_simplify(unsigned int rotation,
                                    unsigned int supported_rotations)
 {
         if (rotation & ~supported_rotations) {
-                rotation ^= DRM_REFLECT_X | DRM_REFLECT_Y;
-                rotation = (rotation & DRM_REFLECT_MASK) |
-                           BIT((ffs(rotation & DRM_ROTATE_MASK) + 1) % 4);
+                rotation ^= DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y;
+                rotation = (rotation & DRM_MODE_REFLECT_MASK) |
+                           BIT((ffs(rotation & DRM_MODE_ROTATE_MASK) + 1)
+                           % 4);
         }
 
         return rotation;
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 1f178b878e42..574af01d3ce9 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -378,7 +378,7 @@ retry:
                         goto fail;
                 }
 
-                plane_state->rotation = DRM_ROTATE_0;
+                plane_state->rotation = DRM_MODE_ROTATE_0;
 
                 plane->old_fb = plane->fb;
                 plane_mask |= 1 << drm_plane_index(plane);
@@ -431,7 +431,7 @@ static int restore_fbdev_mode_legacy(struct drm_fb_helper *fb_helper)
                 if (plane->rotation_property)
                         drm_mode_plane_set_obj_prop(plane,
                                                     plane->rotation_property,
-                                                    DRM_ROTATE_0);
+                                                    DRM_MODE_ROTATE_0);
         }
 
         for (i = 0; i < fb_helper->crtc_count; i++) {
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index b1e28c944637..8dc11064253d 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -521,7 +521,7 @@ struct page **drm_gem_get_pages(struct drm_gem_object *obj)
 
         npages = obj->size >> PAGE_SHIFT;
 
-        pages = drm_malloc_ab(npages, sizeof(struct page *));
+        pages = kvmalloc_array(npages, sizeof(struct page *), GFP_KERNEL);
         if (pages == NULL)
                 return ERR_PTR(-ENOMEM);
 
@@ -546,7 +546,7 @@ fail:
         while (i--)
                 put_page(pages[i]);
 
-        drm_free_large(pages);
+        kvfree(pages);
         return ERR_CAST(p);
 }
 EXPORT_SYMBOL(drm_gem_get_pages);
@@ -582,7 +582,7 @@ void drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages,
                 put_page(pages[i]);
         }
 
-        drm_free_large(pages);
+        kvfree(pages);
 }
 EXPORT_SYMBOL(drm_gem_put_pages);
 
diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c
index 2c27f6f5a668..06aee1741e96 100644
--- a/drivers/gpu/drm/drm_plane_helper.c
+++ b/drivers/gpu/drm/drm_plane_helper.c
@@ -336,7 +336,7 @@ int drm_primary_helper_update(struct drm_plane *plane, struct drm_crtc *crtc,
 
         ret = drm_plane_helper_check_update(plane, crtc, fb,
                                             &src, &dest, &clip,
-                                            DRM_ROTATE_0,
+                                            DRM_MODE_ROTATE_0,
                                             DRM_PLANE_HELPER_NO_SCALING,
                                             DRM_PLANE_HELPER_NO_SCALING,
                                             false, false, &visible);
diff --git a/drivers/gpu/drm/drm_rect.c b/drivers/gpu/drm/drm_rect.c
index bc5575960ebc..9817c1445ba9 100644
--- a/drivers/gpu/drm/drm_rect.c
+++ b/drivers/gpu/drm/drm_rect.c
@@ -310,38 +310,38 @@ void drm_rect_rotate(struct drm_rect *r,
 {
         struct drm_rect tmp;
 
-        if (rotation & (DRM_REFLECT_X | DRM_REFLECT_Y)) {
+        if (rotation & (DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y)) {
                 tmp = *r;
 
-                if (rotation & DRM_REFLECT_X) {
+                if (rotation & DRM_MODE_REFLECT_X) {
                         r->x1 = width - tmp.x2;
                         r->x2 = width - tmp.x1;
                 }
 
-                if (rotation & DRM_REFLECT_Y) {
+                if (rotation & DRM_MODE_REFLECT_Y) {
                         r->y1 = height - tmp.y2;
                         r->y2 = height - tmp.y1;
                 }
         }
 
-        switch (rotation & DRM_ROTATE_MASK) {
-        case DRM_ROTATE_0:
+        switch (rotation & DRM_MODE_ROTATE_MASK) {
+        case DRM_MODE_ROTATE_0:
                 break;
-        case DRM_ROTATE_90:
+        case DRM_MODE_ROTATE_90:
                 tmp = *r;
                 r->x1 = tmp.y1;
                 r->x2 = tmp.y2;
                 r->y1 = width - tmp.x2;
                 r->y2 = width - tmp.x1;
                 break;
-        case DRM_ROTATE_180:
+        case DRM_MODE_ROTATE_180:
                 tmp = *r;
                 r->x1 = width - tmp.x2;
                 r->x2 = width - tmp.x1;
                 r->y1 = height - tmp.y2;
                 r->y2 = height - tmp.y1;
                 break;
-        case DRM_ROTATE_270:
+        case DRM_MODE_ROTATE_270:
                 tmp = *r;
                 r->x1 = height - tmp.y2;
                 r->x2 = height - tmp.y1;
@@ -373,8 +373,8 @@ EXPORT_SYMBOL(drm_rect_rotate);
  * them when doing a rotatation and its inverse.
  * That is, if you do ::
  *
- *     drm_rotate(&r, width, height, rotation);
- *     drm_rotate_inv(&r, width, height, rotation);
+ *     DRM_MODE_PROP_ROTATE(&r, width, height, rotation);
+ *     DRM_MODE_ROTATE_inv(&r, width, height, rotation);
  *
  * you will always get back the original rectangle.
  */
@@ -384,24 +384,24 @@ void drm_rect_rotate_inv(struct drm_rect *r,
 {
         struct drm_rect tmp;
 
-        switch (rotation & DRM_ROTATE_MASK) {
-        case DRM_ROTATE_0:
+        switch (rotation & DRM_MODE_ROTATE_MASK) {
+        case DRM_MODE_ROTATE_0:
                 break;
-        case DRM_ROTATE_90:
+        case DRM_MODE_ROTATE_90:
                 tmp = *r;
                 r->x1 = width - tmp.y2;
                 r->x2 = width - tmp.y1;
                 r->y1 = tmp.x1;
                 r->y2 = tmp.x2;
                 break;
-        case DRM_ROTATE_180:
+        case DRM_MODE_ROTATE_180:
                 tmp = *r;
                 r->x1 = width - tmp.x2;
                 r->x2 = width - tmp.x1;
                 r->y1 = height - tmp.y2;
                 r->y2 = height - tmp.y1;
                 break;
-        case DRM_ROTATE_270:
+        case DRM_MODE_ROTATE_270:
                 tmp = *r;
                 r->x1 = tmp.y1;
                 r->x2 = tmp.y2;
@@ -412,15 +412,15 @@ void drm_rect_rotate_inv(struct drm_rect *r,
                 break;
         }
 
-        if (rotation & (DRM_REFLECT_X | DRM_REFLECT_Y)) {
+        if (rotation & (DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y)) {
                 tmp = *r;
 
-                if (rotation & DRM_REFLECT_X) {
+                if (rotation & DRM_MODE_REFLECT_X) {
                         r->x1 = width - tmp.x2;
                         r->x2 = width - tmp.x1;
                 }
 
-                if (rotation & DRM_REFLECT_Y) {
+                if (rotation & DRM_MODE_REFLECT_Y) {
                         r->y1 = height - tmp.y2;
                         r->y2 = height - tmp.y1;
                 }
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
index fd56f92f3469..d6fb724fc3cc 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -748,7 +748,7 @@ static struct page **etnaviv_gem_userptr_do_get_pages(
         uintptr_t ptr;
         unsigned int flags = 0;
 
-        pvec = drm_malloc_ab(npages, sizeof(struct page *));
+        pvec = kvmalloc_array(npages, sizeof(struct page *), GFP_KERNEL);
         if (!pvec)
                 return ERR_PTR(-ENOMEM);
 
@@ -772,7 +772,7 @@ static struct page **etnaviv_gem_userptr_do_get_pages(
 
         if (ret < 0) {
                 release_pages(pvec, pinned, 0);
-                drm_free_large(pvec);
+                kvfree(pvec);
                 return ERR_PTR(ret);
         }
 
@@ -823,7 +823,7 @@ static int etnaviv_gem_userptr_get_pages(struct etnaviv_gem_object *etnaviv_obj)
         mm = get_task_mm(etnaviv_obj->userptr.task);
         pinned = 0;
         if (mm == current->mm) {
-                pvec = drm_malloc_ab(npages, sizeof(struct page *));
+                pvec = kvmalloc_array(npages, sizeof(struct page *), GFP_KERNEL);
                 if (!pvec) {
                         mmput(mm);
                         return -ENOMEM;
@@ -832,7 +832,7 @@ static int etnaviv_gem_userptr_get_pages(struct etnaviv_gem_object *etnaviv_obj)
                 pinned = __get_user_pages_fast(etnaviv_obj->userptr.ptr, npages,
                                                !etnaviv_obj->userptr.ro, pvec);
                 if (pinned < 0) {
-                        drm_free_large(pvec);
+                        kvfree(pvec);
                         mmput(mm);
                         return pinned;
                 }
@@ -845,7 +845,7 @@ static int etnaviv_gem_userptr_get_pages(struct etnaviv_gem_object *etnaviv_obj)
         }
 
         release_pages(pvec, pinned, 0);
-        drm_free_large(pvec);
+        kvfree(pvec);
 
         work = kmalloc(sizeof(*work), GFP_KERNEL);
         if (!work) {
@@ -879,7 +879,7 @@ static void etnaviv_gem_userptr_release(struct etnaviv_gem_object *etnaviv_obj)
                 int npages = etnaviv_obj->base.size >> PAGE_SHIFT;
 
                 release_pages(etnaviv_obj->pages, npages, 0);
-                drm_free_large(etnaviv_obj->pages);
+                kvfree(etnaviv_obj->pages);
         }
         put_task_struct(etnaviv_obj->userptr.task);
 }
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
index 62b47972a52e..367bf952f61a 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
@@ -87,7 +87,7 @@ static void etnaviv_gem_prime_release(struct etnaviv_gem_object *etnaviv_obj)
          * ours, just free the array we allocated:
          */
         if (etnaviv_obj->pages)
-                drm_free_large(etnaviv_obj->pages);
+                kvfree(etnaviv_obj->pages);
 
         drm_prime_gem_destroy(&etnaviv_obj->base, etnaviv_obj->sgt);
 }
@@ -128,7 +128,7 @@ struct drm_gem_object *etnaviv_gem_prime_import_sg_table(struct drm_device *dev,
         npages = size / PAGE_SIZE;
 
         etnaviv_obj->sgt = sgt;
-        etnaviv_obj->pages = drm_malloc_ab(npages, sizeof(struct page *));
+        etnaviv_obj->pages = kvmalloc_array(npages, sizeof(struct page *), GFP_KERNEL);
         if (!etnaviv_obj->pages) {
                 ret = -ENOMEM;
                 goto fail;
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
index e1909429837e..a13930e1d8c9 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
@@ -343,9 +343,9 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data,
          * Copy the command submission and bo array to kernel space in
          * one go, and do this outside of any locks.
          */
-        bos = drm_malloc_ab(args->nr_bos, sizeof(*bos));
-        relocs = drm_malloc_ab(args->nr_relocs, sizeof(*relocs));
-        stream = drm_malloc_ab(1, args->stream_size);
+        bos = kvmalloc_array(args->nr_bos, sizeof(*bos), GFP_KERNEL);
+        relocs = kvmalloc_array(args->nr_relocs, sizeof(*relocs), GFP_KERNEL);
+        stream = kvmalloc_array(1, args->stream_size, GFP_KERNEL);
         cmdbuf = etnaviv_cmdbuf_new(gpu->cmdbuf_suballoc,
                                     ALIGN(args->stream_size, 8) + 8,
                                     args->nr_bos);
@@ -487,11 +487,11 @@ err_submit_cmds:
         if (cmdbuf)
                 etnaviv_cmdbuf_free(cmdbuf);
         if (stream)
-                drm_free_large(stream);
+                kvfree(stream);
         if (bos)
-                drm_free_large(bos);
+                kvfree(bos);
         if (relocs)
-                drm_free_large(relocs);
+                kvfree(relocs);
 
         return ret;
 }
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
index 55a1579d11b3..c23479be4850 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
@@ -59,7 +59,8 @@ static int exynos_drm_alloc_buf(struct exynos_drm_gem *exynos_gem)
 
         nr_pages = exynos_gem->size >> PAGE_SHIFT;
 
-        exynos_gem->pages = drm_calloc_large(nr_pages, sizeof(struct page *));
+        exynos_gem->pages = kvmalloc_array(nr_pages, sizeof(struct page *),
+                        GFP_KERNEL | __GFP_ZERO);
         if (!exynos_gem->pages) {
                 DRM_ERROR("failed to allocate pages.\n");
                 return -ENOMEM;
@@ -101,7 +102,7 @@ err_dma_free:
         dma_free_attrs(to_dma_dev(dev), exynos_gem->size, exynos_gem->cookie,
                        exynos_gem->dma_addr, exynos_gem->dma_attrs);
 err_free:
-        drm_free_large(exynos_gem->pages);
+        kvfree(exynos_gem->pages);
 
         return ret;
 }
@@ -122,7 +123,7 @@ static void exynos_drm_free_buf(struct exynos_drm_gem *exynos_gem)
                         (dma_addr_t)exynos_gem->dma_addr,
                         exynos_gem->dma_attrs);
 
-        drm_free_large(exynos_gem->pages);
+        kvfree(exynos_gem->pages);
 }
 
 static int exynos_drm_gem_handle_create(struct drm_gem_object *obj,
@@ -559,7 +560,7 @@ exynos_drm_gem_prime_import_sg_table(struct drm_device *dev,
         exynos_gem->dma_addr = sg_dma_address(sgt->sgl);
 
         npages = exynos_gem->size >> PAGE_SHIFT;
-        exynos_gem->pages = drm_malloc_ab(npages, sizeof(struct page *));
+        exynos_gem->pages = kvmalloc_array(npages, sizeof(struct page *), GFP_KERNEL);
         if (!exynos_gem->pages) {
                 ret = -ENOMEM;
                 goto err;
@@ -588,7 +589,7 @@ exynos_drm_gem_prime_import_sg_table(struct drm_device *dev,
         return &exynos_gem->base;
 
 err_free_large:
-        drm_free_large(exynos_gem->pages);
+        kvfree(exynos_gem->pages);
 err:
         drm_gem_object_release(&exynos_gem->base);
         kfree(exynos_gem);
diff --git a/drivers/gpu/drm/gma500/Makefile b/drivers/gpu/drm/gma500/Makefile
index 190e55f2f891..c1c8dc18aa53 100644
--- a/drivers/gpu/drm/gma500/Makefile
+++ b/drivers/gpu/drm/gma500/Makefile
@@ -1,7 +1,6 @@
 #
 #       KMS driver for the GMA500
 #
-ccflags-y += -I$(srctree)/include/drm
 
 gma500_gfx-y += \
           accel_2d.o \
diff --git a/drivers/gpu/drm/gma500/mdfld_tpo_vid.c b/drivers/gpu/drm/gma500/mdfld_tpo_vid.c
index d40628e6810d..a9420bf9a419 100644
--- a/drivers/gpu/drm/gma500/mdfld_tpo_vid.c
+++ b/drivers/gpu/drm/gma500/mdfld_tpo_vid.c
@@ -30,8 +30,6 @@
 static struct drm_display_mode *tpo_vid_get_config_mode(struct drm_device *dev)
 {
         struct drm_display_mode *mode;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct oaktrail_timing_info *ti = &dev_priv->gct_data.DTD;
 
         mode = kzalloc(sizeof(*mode), GFP_KERNEL);
         if (!mode)
diff --git a/drivers/gpu/drm/hisilicon/hibmc/Makefile b/drivers/gpu/drm/hisilicon/hibmc/Makefile
index f2e04c035673..3df726696372 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/Makefile
+++ b/drivers/gpu/drm/hisilicon/hibmc/Makefile
@@ -1,4 +1,3 @@
-ccflags-y := -Iinclude/drm
 hibmc-drm-y := hibmc_drm_drv.o hibmc_drm_de.o hibmc_drm_vdac.o hibmc_drm_fbdev.o hibmc_ttm.o
 
 obj-$(CONFIG_DRM_HISI_HIBMC) += hibmc-drm.o
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
index 20732b62d4c9..ac457c779caa 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
@@ -17,7 +17,7 @@
  */
 
 #include <drm/drm_atomic_helper.h>
-#include <ttm/ttm_page_alloc.h>
+#include <drm/ttm/ttm_page_alloc.h>
 
 #include "hibmc_drm_drv.h"
 
diff --git a/drivers/gpu/drm/i2c/Makefile b/drivers/gpu/drm/i2c/Makefile
index 43aa33baebed..a77acfc1852e 100644
--- a/drivers/gpu/drm/i2c/Makefile
+++ b/drivers/gpu/drm/i2c/Makefile
@@ -1,5 +1,3 @@
-ccflags-y := -Iinclude/drm
-
 ch7006-y := ch7006_drv.o ch7006_mode.o
 obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o
 
diff --git a/drivers/gpu/drm/i810/Makefile b/drivers/gpu/drm/i810/Makefile
index 43844ecafcc5..639f8596c978 100644
--- a/drivers/gpu/drm/i810/Makefile
+++ b/drivers/gpu/drm/i810/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y := -Iinclude/drm
 i810-y := i810_drv.o i810_dma.o
 
 obj-$(CONFIG_DRM_I810)  += i810.o
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index d689e511744e..1c66108f4333 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -229,7 +229,7 @@ static int i915_gem_stolen_list_info(struct seq_file *m, void *data)
         int ret;
 
         total = READ_ONCE(dev_priv->mm.object_count);
-        objects = drm_malloc_ab(total, sizeof(*objects));
+        objects = kvmalloc_array(total, sizeof(*objects), GFP_KERNEL);
         if (!objects)
                 return -ENOMEM;
 
@@ -274,7 +274,7 @@ static int i915_gem_stolen_list_info(struct seq_file *m, void *data)
 
         mutex_unlock(&dev->struct_mutex);
 out:
-        drm_free_large(objects);
+        kvfree(objects);
         return ret;
 }
 
@@ -3095,17 +3095,17 @@ static const char *plane_rotation(unsigned int rotation)
 {
         static char buf[48];
         /*
-         * According to doc only one DRM_ROTATE_ is allowed but this
+         * According to doc only one DRM_MODE_ROTATE_ is allowed but this
          * will print them all to visualize if the values are misused
          */
         snprintf(buf, sizeof(buf),
                  "%s%s%s%s%s%s(0x%08x)",
-                 (rotation & DRM_ROTATE_0) ? "0 " : "",
-                 (rotation & DRM_ROTATE_90) ? "90 " : "",
-                 (rotation & DRM_ROTATE_180) ? "180 " : "",
-                 (rotation & DRM_ROTATE_270) ? "270 " : "",
-                 (rotation & DRM_REFLECT_X) ? "FLIPX " : "",
-                 (rotation & DRM_REFLECT_Y) ? "FLIPY " : "",
+                 (rotation & DRM_MODE_ROTATE_0) ? "0 " : "",
+                 (rotation & DRM_MODE_ROTATE_90) ? "90 " : "",
+                 (rotation & DRM_MODE_ROTATE_180) ? "180 " : "",
+                 (rotation & DRM_MODE_ROTATE_270) ? "270 " : "",
+                 (rotation & DRM_MODE_REFLECT_X) ? "FLIPX " : "",
+                 (rotation & DRM_MODE_REFLECT_Y) ? "FLIPY " : "",
                  rotation);
 
         return buf;
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index b6ac3df18b58..0e07f35e270c 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2504,7 +2504,7 @@ static void *i915_gem_object_map(const struct drm_i915_gem_object *obj,
 
         if (n_pages > ARRAY_SIZE(stack_pages)) {
                 /* Too big for stack -- allocate temporary array instead */
-                pages = drm_malloc_gfp(n_pages, sizeof(*pages), GFP_TEMPORARY);
+                pages = kvmalloc_array(n_pages, sizeof(*pages), GFP_TEMPORARY);
                 if (!pages)
                         return NULL;
         }
@@ -2526,7 +2526,7 @@ static void *i915_gem_object_map(const struct drm_i915_gem_object *obj,
         addr = vmap(pages, n_pages, 0, pgprot);
 
         if (pages != stack_pages)
-                drm_free_large(pages);
+                kvfree(pages);
 
         return addr;
 }
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index a3e59c8ef27b..4ee2dc38b7c9 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1019,11 +1019,11 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev,
         for (i = 0; i < count; i++)
                 total += exec[i].relocation_count;
 
-        reloc_offset = drm_malloc_ab(count, sizeof(*reloc_offset));
-        reloc = drm_malloc_ab(total, sizeof(*reloc));
+        reloc_offset = kvmalloc_array(count, sizeof(*reloc_offset), GFP_KERNEL);
+        reloc = kvmalloc_array(total, sizeof(*reloc), GFP_KERNEL);
         if (reloc == NULL || reloc_offset == NULL) {
-                drm_free_large(reloc);
-                drm_free_large(reloc_offset);
+                kvfree(reloc);
+                kvfree(reloc_offset);
                 mutex_lock(&dev->struct_mutex);
                 return -ENOMEM;
         }
@@ -1099,8 +1099,8 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev,
          */
 
 err:
-        drm_free_large(reloc);
-        drm_free_large(reloc_offset);
+        kvfree(reloc);
+        kvfree(reloc_offset);
         return ret;
 }
 
@@ -1859,13 +1859,13 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
         }
 
         /* Copy in the exec list from userland */
-        exec_list = drm_malloc_ab(sizeof(*exec_list), args->buffer_count);
-        exec2_list = drm_malloc_ab(sizeof(*exec2_list), args->buffer_count);
+        exec_list = kvmalloc_array(sizeof(*exec_list), args->buffer_count, GFP_KERNEL);
+        exec2_list = kvmalloc_array(sizeof(*exec2_list), args->buffer_count, GFP_KERNEL);
         if (exec_list == NULL || exec2_list == NULL) {
                 DRM_DEBUG("Failed to allocate exec list for %d buffers\n",
                           args->buffer_count);
-                drm_free_large(exec_list);
-                drm_free_large(exec2_list);
+                kvfree(exec_list);
+                kvfree(exec2_list);
                 return -ENOMEM;
         }
         ret = copy_from_user(exec_list,
@@ -1874,8 +1874,8 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
         if (ret != 0) {
                 DRM_DEBUG("copy %d exec entries failed %d\n",
                           args->buffer_count, ret);
-                drm_free_large(exec_list);
-                drm_free_large(exec2_list);
+                kvfree(exec_list);
+                kvfree(exec2_list);
                 return -EFAULT;
         }
 
@@ -1924,8 +1924,8 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
                 }
         }
 
-        drm_free_large(exec_list);
-        drm_free_large(exec2_list);
+        kvfree(exec_list);
+        kvfree(exec2_list);
         return ret;
 }
 
@@ -1943,7 +1943,7 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data,
                 return -EINVAL;
         }
 
-        exec2_list = drm_malloc_gfp(args->buffer_count,
+        exec2_list = kvmalloc_array(args->buffer_count,
                                     sizeof(*exec2_list),
                                     GFP_TEMPORARY);
         if (exec2_list == NULL) {
@@ -1957,7 +1957,7 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data,
         if (ret != 0) {
                 DRM_DEBUG("copy %d exec entries failed %d\n",
                           args->buffer_count, ret);
-                drm_free_large(exec2_list);
+                kvfree(exec2_list);
                 return -EFAULT;
         }
 
@@ -1984,6 +1984,6 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data,
                 }
         }
 
-        drm_free_large(exec2_list);
+        kvfree(exec2_list);
         return ret;
 }
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 2aa6b97fd22f..7e3193aa7da1 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -3102,7 +3102,7 @@ intel_rotate_pages(struct intel_rotation_info *rot_info,
         int ret = -ENOMEM;
 
         /* Allocate a temporary list of source pages for random access. */
-        page_addr_list = drm_malloc_gfp(n_pages,
+        page_addr_list = kvmalloc_array(n_pages,
                                         sizeof(dma_addr_t),
                                         GFP_TEMPORARY);
         if (!page_addr_list)
@@ -3135,14 +3135,14 @@ intel_rotate_pages(struct intel_rotation_info *rot_info,
         DRM_DEBUG_KMS("Created rotated page mapping for object size %zu (%ux%u tiles, %u pages)\n",
                       obj->base.size, rot_info->plane[0].width, rot_info->plane[0].height, size);
 
-        drm_free_large(page_addr_list);
+        kvfree(page_addr_list);
 
         return st;
 
 err_sg_alloc:
         kfree(st);
 err_st_alloc:
-        drm_free_large(page_addr_list);
+        kvfree(page_addr_list);
 
         DRM_DEBUG_KMS("Failed to create rotated mapping for object size %zu! (%ux%u tiles, %u pages)\n",
                       obj->base.size, rot_info->plane[0].width, rot_info->plane[0].height, size);
diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c
index 58ccf8b8ca1c..1a0ce1dc68f5 100644
--- a/drivers/gpu/drm/i915/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
@@ -507,7 +507,7 @@ __i915_gem_userptr_get_pages_worker(struct work_struct *_work)
         ret = -ENOMEM;
         pinned = 0;
 
-        pvec = drm_malloc_gfp(npages, sizeof(struct page *), GFP_TEMPORARY);
+        pvec = kvmalloc_array(npages, sizeof(struct page *), GFP_TEMPORARY);
         if (pvec != NULL) {
                 struct mm_struct *mm = obj->userptr.mm->mm;
                 unsigned int flags = 0;
@@ -555,7 +555,7 @@ __i915_gem_userptr_get_pages_worker(struct work_struct *_work)
         mutex_unlock(&obj->mm.lock);
 
         release_pages(pvec, pinned, 0);
-        drm_free_large(pvec);
+        kvfree(pvec);
 
         i915_gem_object_put(obj);
         put_task_struct(work->task);
@@ -642,7 +642,7 @@ i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj)
         pinned = 0;
 
         if (mm == current->mm) {
-                pvec = drm_malloc_gfp(num_pages, sizeof(struct page *),
+                pvec = kvmalloc_array(num_pages, sizeof(struct page *),
                                       GFP_TEMPORARY |
                                       __GFP_NORETRY |
                                       __GFP_NOWARN);
@@ -669,7 +669,7 @@ i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj)
 
         if (IS_ERR(pages))
                 release_pages(pvec, pinned, 0);
-        drm_free_large(pvec);
+        kvfree(pvec);
 
         return pages;
 }
diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c
index cfb47293fd53..a40c82c65450 100644
--- a/drivers/gpu/drm/i915/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
@@ -55,7 +55,7 @@ intel_create_plane_state(struct drm_plane *plane)
                 return NULL;
 
         state->base.plane = plane;
-        state->base.rotation = DRM_ROTATE_0;
+        state->base.rotation = DRM_MODE_ROTATE_0;
         state->ckey.flags = I915_SET_COLORKEY_NONE;
 
         return state;
@@ -178,8 +178,8 @@ int intel_plane_atomic_check_with_state(struct intel_crtc_state *crtc_state,
 
         /* CHV ignores the mirror bit when the rotate bit is set :( */
         if (IS_CHERRYVIEW(dev_priv) &&
-            state->rotation & DRM_ROTATE_180 &&
-            state->rotation & DRM_REFLECT_X) {
+            state->rotation & DRM_MODE_ROTATE_180 &&
+            state->rotation & DRM_MODE_REFLECT_X) {
                 DRM_DEBUG_KMS("Cannot rotate and reflect at the same time\n");
                 return -EINVAL;
         }
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2f2bb623cf5f..6a037b856d96 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2468,7 +2468,7 @@ intel_fill_fb_info(struct drm_i915_private *dev_priv,
 
                 offset = _intel_compute_tile_offset(dev_priv, &x, &y,
                                                     fb, i, fb->pitches[i],
-                                                    DRM_ROTATE_0, tile_size);
+                                                    DRM_MODE_ROTATE_0, tile_size);
                 offset /= tile_size;
 
                 if (fb->modifier != DRM_FORMAT_MOD_LINEAR) {
@@ -2503,7 +2503,7 @@ intel_fill_fb_info(struct drm_i915_private *dev_priv,
                         drm_rect_rotate(&r,
                                         rot_info->plane[i].width * tile_width,
                                         rot_info->plane[i].height * tile_height,
-                                        DRM_ROTATE_270);
+                                        DRM_MODE_ROTATE_270);
                         x = r.x1;
                         y = r.y1;
 
@@ -2939,7 +2939,7 @@ int skl_check_plane_surface(struct intel_plane_state *plane_state)
         if (drm_rotation_90_or_270(rotation))
                 drm_rect_rotate(&plane_state->base.src,
                                 fb->width << 16, fb->height << 16,
-                                DRM_ROTATE_270);
+                                DRM_MODE_ROTATE_270);
 
         /*
          * Handle the AUX surface first since
@@ -3017,10 +3017,10 @@ static u32 i9xx_plane_ctl(const struct intel_crtc_state *crtc_state,
             fb->modifier == I915_FORMAT_MOD_X_TILED)
                 dspcntr |= DISPPLANE_TILED;
 
-        if (rotation & DRM_ROTATE_180)
+        if (rotation & DRM_MODE_ROTATE_180)
                 dspcntr |= DISPPLANE_ROTATE_180;
 
-        if (rotation & DRM_REFLECT_X)
+        if (rotation & DRM_MODE_REFLECT_X)
                 dspcntr |= DISPPLANE_MIRROR;
 
         return dspcntr;
@@ -3048,10 +3048,10 @@ int i9xx_check_plane_surface(struct intel_plane_state *plane_state)
                 int src_w = drm_rect_width(&plane_state->base.src) >> 16;
                 int src_h = drm_rect_height(&plane_state->base.src) >> 16;
 
-                if (rotation & DRM_ROTATE_180) {
+                if (rotation & DRM_MODE_ROTATE_180) {
                         src_x += src_w - 1;
                         src_y += src_h - 1;
-                } else if (rotation & DRM_REFLECT_X) {
+                } else if (rotation & DRM_MODE_REFLECT_X) {
                         src_x += src_w - 1;
                 }
         }
@@ -3271,17 +3271,17 @@ static u32 skl_plane_ctl_tiling(uint64_t fb_modifier)
 static u32 skl_plane_ctl_rotation(unsigned int rotation)
 {
         switch (rotation) {
-        case DRM_ROTATE_0:
+        case DRM_MODE_ROTATE_0:
                 break;
         /*
-         * DRM_ROTATE_ is counter clockwise to stay compatible with Xrandr
+         * DRM_MODE_ROTATE_ is counter clockwise to stay compatible with Xrandr
          * while i915 HW rotation is clockwise, thats why this swapping.
          */
-        case DRM_ROTATE_90:
+        case DRM_MODE_ROTATE_90:
                 return PLANE_CTL_ROTATE_270;
-        case DRM_ROTATE_180:
+        case DRM_MODE_ROTATE_180:
                 return PLANE_CTL_ROTATE_180;
-        case DRM_ROTATE_270:
+        case DRM_MODE_ROTATE_270:
                 return PLANE_CTL_ROTATE_90;
         default:
                 MISSING_CASE(rotation);
@@ -4671,7 +4671,7 @@ int skl_update_scaler_crtc(struct intel_crtc_state *state)
         const struct drm_display_mode *adjusted_mode = &state->base.adjusted_mode;
 
         return skl_update_scaler(state, !state->base.active, SKL_CRTC_INDEX,
-                &state->scaler_state.scaler_id, DRM_ROTATE_0,
+                &state->scaler_state.scaler_id, DRM_MODE_ROTATE_0,
                 state->pipe_src_w, state->pipe_src_h,
                 adjusted_mode->crtc_hdisplay, adjusted_mode->crtc_vdisplay);
 }
@@ -9239,7 +9239,7 @@ static u32 i9xx_cursor_ctl(const struct intel_crtc_state *crtc_state,
                 return 0;
         }
 
-        if (plane_state->base.rotation & DRM_ROTATE_180)
+        if (plane_state->base.rotation & DRM_MODE_ROTATE_180)
                 cntl |= CURSOR_ROTATE_180;
 
         return cntl;
@@ -9300,7 +9300,7 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc,
 
                 /* ILK+ do this automagically */
                 if (HAS_GMCH_DISPLAY(dev_priv) &&
-                    plane_state->base.rotation & DRM_ROTATE_180) {
+                    plane_state->base.rotation & DRM_MODE_ROTATE_180) {
                         base += (plane_state->base.crtc_h *
                                  plane_state->base.crtc_w - 1) * 4;
                 }
@@ -13607,22 +13607,22 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)
 
         if (INTEL_GEN(dev_priv) >= 9) {
                 supported_rotations =
-                        DRM_ROTATE_0 | DRM_ROTATE_90 |
-                        DRM_ROTATE_180 | DRM_ROTATE_270;
+                        DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_90 |
+                        DRM_MODE_ROTATE_180 | DRM_MODE_ROTATE_270;
         } else if (IS_CHERRYVIEW(dev_priv) && pipe == PIPE_B) {
                 supported_rotations =
-                        DRM_ROTATE_0 | DRM_ROTATE_180 |
-                        DRM_REFLECT_X;
+                        DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180 |
+                        DRM_MODE_REFLECT_X;
         } else if (INTEL_GEN(dev_priv) >= 4) {
                 supported_rotations =
-                        DRM_ROTATE_0 | DRM_ROTATE_180;
+                        DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180;
         } else {
-                supported_rotations = DRM_ROTATE_0;
+                supported_rotations = DRM_MODE_ROTATE_0;
         }
 
         if (INTEL_GEN(dev_priv) >= 4)
                 drm_plane_create_rotation_property(&primary->base,
-                                                   DRM_ROTATE_0,
+                                                   DRM_MODE_ROTATE_0,
                                                    supported_rotations);
 
         drm_plane_helper_add(&primary->base, &intel_plane_helper_funcs);
@@ -13777,9 +13777,9 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)
 
         if (INTEL_GEN(dev_priv) >= 4)
                 drm_plane_create_rotation_property(&cursor->base,
-                                                   DRM_ROTATE_0,
-                                                   DRM_ROTATE_0 |
-                                                   DRM_ROTATE_180);
+                                                   DRM_MODE_ROTATE_0,
+                                                   DRM_MODE_ROTATE_0 |
+                                                   DRM_MODE_ROTATE_180);
 
         if (INTEL_GEN(dev_priv) >= 9)
                 state->scaler_id = -1;
diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c
index ded2add18b26..db7f8f0a1f36 100644
--- a/drivers/gpu/drm/i915/intel_fbc.c
+++ b/drivers/gpu/drm/i915/intel_fbc.c
@@ -801,7 +801,7 @@ static bool intel_fbc_can_activate(struct intel_crtc *crtc)
                 return false;
         }
         if (INTEL_GEN(dev_priv) <= 4 && !IS_G4X(dev_priv) &&
-            cache->plane.rotation != DRM_ROTATE_0) {
+            cache->plane.rotation != DRM_MODE_ROTATE_0) {
                 fbc->no_fbc_reason = "rotation unsupported";
                 return false;
         }
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 332254a8eebe..03347c6ae599 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -211,7 +211,7 @@ static int intelfb_create(struct drm_fb_helper *helper,
          * This also validates that any existing fb inherited from the
          * BIOS is suitable for own access.
          */
-        vma = intel_pin_and_fence_fb_obj(&ifbdev->fb->base, DRM_ROTATE_0);
+        vma = intel_pin_and_fence_fb_obj(&ifbdev->fb->base, DRM_MODE_ROTATE_0);
         if (IS_ERR(vma)) {
                 ret = PTR_ERR(vma);
                 goto out_unlock;
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 8c87c717c7cd..191e14ddde0c 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -398,10 +398,10 @@ static u32 vlv_sprite_ctl(const struct intel_crtc_state *crtc_state,
         if (fb->modifier == I915_FORMAT_MOD_X_TILED)
                 sprctl |= SP_TILED;
 
-        if (rotation & DRM_ROTATE_180)
+        if (rotation & DRM_MODE_ROTATE_180)
                 sprctl |= SP_ROTATE_180;
 
-        if (rotation & DRM_REFLECT_X)
+        if (rotation & DRM_MODE_REFLECT_X)
                 sprctl |= SP_MIRROR;
 
         if (key->flags & I915_SET_COLORKEY_SOURCE)
@@ -533,7 +533,7 @@ static u32 ivb_sprite_ctl(const struct intel_crtc_state *crtc_state,
         if (fb->modifier == I915_FORMAT_MOD_X_TILED)
                 sprctl |= SPRITE_TILED;
 
-        if (rotation & DRM_ROTATE_180)
+        if (rotation & DRM_MODE_ROTATE_180)
                 sprctl |= SPRITE_ROTATE_180;
 
         if (key->flags & I915_SET_COLORKEY_DESTINATION)
@@ -674,7 +674,7 @@ static u32 ilk_sprite_ctl(const struct intel_crtc_state *crtc_state,
         if (fb->modifier == I915_FORMAT_MOD_X_TILED)
                 dvscntr |= DVS_TILED;
 
-        if (rotation & DRM_ROTATE_180)
+        if (rotation & DRM_MODE_ROTATE_180)
                 dvscntr |= DVS_ROTATE_180;
 
         if (key->flags & I915_SET_COLORKEY_DESTINATION)
@@ -1145,15 +1145,15 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
 
         if (INTEL_GEN(dev_priv) >= 9) {
                 supported_rotations =
-                        DRM_ROTATE_0 | DRM_ROTATE_90 |
-                        DRM_ROTATE_180 | DRM_ROTATE_270;
+                        DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_90 |
+                        DRM_MODE_ROTATE_180 | DRM_MODE_ROTATE_270;
         } else if (IS_CHERRYVIEW(dev_priv) && pipe == PIPE_B) {
                 supported_rotations =
-                        DRM_ROTATE_0 | DRM_ROTATE_180 |
-                        DRM_REFLECT_X;
+                        DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180 |
+                        DRM_MODE_REFLECT_X;
         } else {
                 supported_rotations =
-                        DRM_ROTATE_0 | DRM_ROTATE_180;
+                        DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180;
         }
 
         intel_plane->pipe = pipe;
@@ -1180,7 +1180,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
                 goto fail;
 
         drm_plane_create_rotation_property(&intel_plane->base,
-                                           DRM_ROTATE_0,
+                                           DRM_MODE_ROTATE_0,
                                            supported_rotations);
 
         drm_plane_helper_add(&intel_plane->base, &intel_plane_helper_funcs);
diff --git a/drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c b/drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c
index 19860a372d90..7276194c04f7 100644
--- a/drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c
+++ b/drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c
@@ -117,7 +117,7 @@ static int igt_random_insert_remove(void *arg)
 
         mock_engine_reset(engine);
 
-        waiters = drm_malloc_gfp(count, sizeof(*waiters), GFP_TEMPORARY);
+        waiters = kvmalloc_array(count, sizeof(*waiters), GFP_TEMPORARY);
         if (!waiters)
                 goto out_engines;
 
@@ -169,7 +169,7 @@ out_order:
 out_bitmap:
         kfree(bitmap);
 out_waiters:
-        drm_free_large(waiters);
+        kvfree(waiters);
 out_engines:
         mock_engine_flush(engine);
         return err;
@@ -187,7 +187,7 @@ static int igt_insert_complete(void *arg)
 
         mock_engine_reset(engine);
 
-        waiters = drm_malloc_gfp(count, sizeof(*waiters), GFP_TEMPORARY);
+        waiters = kvmalloc_array(count, sizeof(*waiters), GFP_TEMPORARY);
         if (!waiters)
                 goto out_engines;
 
@@ -254,7 +254,7 @@ static int igt_insert_complete(void *arg)
 out_bitmap:
         kfree(bitmap);
 out_waiters:
-        drm_free_large(waiters);
+        kvfree(waiters);
 out_engines:
         mock_engine_flush(engine);
         return err;
@@ -368,7 +368,7 @@ static int igt_wakeup(void *arg)
 
         mock_engine_reset(engine);
 
-        waiters = drm_malloc_gfp(count, sizeof(*waiters), GFP_TEMPORARY);
+        waiters = kvmalloc_array(count, sizeof(*waiters), GFP_TEMPORARY);
         if (!waiters)
                 goto out_engines;
 
@@ -454,7 +454,7 @@ out_waiters:
                 put_task_struct(waiters[n].tsk);
         }
 
-        drm_free_large(waiters);
+        kvfree(waiters);
 out_engines:
         mock_engine_flush(engine);
         return err;
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c
index d63e853a0300..49546222c6d3 100644
--- a/drivers/gpu/drm/imx/ipuv3-plane.c
+++ b/drivers/gpu/drm/imx/ipuv3-plane.c
@@ -273,7 +273,7 @@ void ipu_plane_state_reset(struct drm_plane *plane)
 
         if (ipu_state) {
                 ipu_state->base.plane = plane;
-                ipu_state->base.rotation = DRM_ROTATE_0;
+                ipu_state->base.rotation = DRM_MODE_ROTATE_0;
         }
 
         plane->state = &ipu_state->base;
diff --git a/drivers/gpu/drm/mga/Makefile b/drivers/gpu/drm/mga/Makefile
index 60684785c203..49e972c2f787 100644
--- a/drivers/gpu/drm/mga/Makefile
+++ b/drivers/gpu/drm/mga/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y := -Iinclude/drm
 mga-y := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o
 
 mga-$(CONFIG_COMPAT) += mga_ioc32.o
diff --git a/drivers/gpu/drm/mgag200/Makefile b/drivers/gpu/drm/mgag200/Makefile
index a9a0300f09fc..3d91d1d6c45d 100644
--- a/drivers/gpu/drm/mgag200/Makefile
+++ b/drivers/gpu/drm/mgag200/Makefile
@@ -1,4 +1,3 @@
-ccflags-y := -Iinclude/drm
 mgag200-y   := mgag200_main.o mgag200_mode.o mgag200_cursor.o \
         mgag200_drv.o mgag200_fb.o mgag200_i2c.o mgag200_ttm.o
 
diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c b/drivers/gpu/drm/mgag200/mgag200_ttm.c
index 565a217b46f2..3e7e1cd31395 100644
--- a/drivers/gpu/drm/mgag200/mgag200_ttm.c
+++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c
@@ -26,8 +26,9 @@
  * Authors: Dave Airlie <airlied@redhat.com>
  */
 #include <drm/drmP.h>
+#include <drm/ttm/ttm_page_alloc.h>
+
 #include "mgag200_drv.h"
-#include <ttm/ttm_page_alloc.h>
 
 static inline struct mga_device *
 mgag200_bdev(struct ttm_bo_device *bd)
diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile
index 5241ac8803ba..33008fa1be9b 100644
--- a/drivers/gpu/drm/msm/Makefile
+++ b/drivers/gpu/drm/msm/Makefile
@@ -1,4 +1,4 @@
-ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/msm
+ccflags-y := -Idrivers/gpu/drm/msm
 ccflags-$(CONFIG_DRM_MSM_DSI) += -Idrivers/gpu/drm/msm/dsi
 
 msm-y := \
diff --git a/drivers/gpu/drm/msm/dsi/dsi.h b/drivers/gpu/drm/msm/dsi/dsi.h
index 32369975d155..9e6017387efb 100644
--- a/drivers/gpu/drm/msm/dsi/dsi.h
+++ b/drivers/gpu/drm/msm/dsi/dsi.h
@@ -17,9 +17,9 @@
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 
-#include "drm_crtc.h"
-#include "drm_mipi_dsi.h"
-#include "drm_panel.h"
+#include <drm/drm_crtc.h>
+#include <drm/drm_mipi_dsi.h>
+#include <drm/drm_panel.h>
 
 #include "msm_drv.h"
 
diff --git a/drivers/gpu/drm/msm/edp/edp.h b/drivers/gpu/drm/msm/edp/edp.h
index ba5bedde5241..e0f5818ec9ca 100644
--- a/drivers/gpu/drm/msm/edp/edp.h
+++ b/drivers/gpu/drm/msm/edp/edp.h
@@ -18,9 +18,9 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_dp_helper.h>
 
-#include "drm_crtc.h"
-#include "drm_dp_helper.h"
 #include "msm_drv.h"
 
 #define edp_read(offset) msm_readl((offset))
diff --git a/drivers/gpu/drm/msm/edp/edp_ctrl.c b/drivers/gpu/drm/msm/edp/edp_ctrl.c
index 149bfe7ddd82..e32a4a4f3797 100644
--- a/drivers/gpu/drm/msm/edp/edp_ctrl.c
+++ b/drivers/gpu/drm/msm/edp/edp_ctrl.c
@@ -14,10 +14,10 @@
 #include <linux/clk.h>
 #include <linux/gpio/consumer.h>
 #include <linux/regulator/consumer.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_dp_helper.h>
+#include <drm/drm_edid.h>
 
-#include "drm_crtc.h"
-#include "drm_dp_helper.h"
-#include "drm_edid.h"
 #include "edp.h"
 #include "edp.xml.h"
 
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
index f29194a74a19..698e514203c6 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
@@ -15,12 +15,12 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mdp4_kms.h"
-
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_flip_work.h>
 #include <drm/drm_mode.h>
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
-#include "drm_flip_work.h"
+
+#include "mdp4_kms.h"
 
 struct mdp4_crtc {
         struct drm_crtc base;
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c
index 106f0e772595..6a1ebdace391 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c
@@ -17,10 +17,10 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mdp4_kms.h"
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
 
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
+#include "mdp4_kms.h"
 
 struct mdp4_dsi_encoder {
         struct drm_encoder base;
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c
index 24258e3025e3..ba8e587f734b 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c
@@ -15,11 +15,10 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mdp4_kms.h"
-
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
 
+#include "mdp4_kms.h"
 
 struct mdp4_dtv_encoder {
         struct drm_encoder base;
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h
index 62712ca164ee..c413779d488a 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h
@@ -18,12 +18,14 @@
 #ifndef __MDP4_KMS_H__
 #define __MDP4_KMS_H__
 
+#include <drm/drm_panel.h>
+
 #include "msm_drv.h"
 #include "msm_kms.h"
 #include "mdp/mdp_kms.h"
 #include "mdp4.xml.h"
 
-#include "drm_panel.h"
+struct device_node;
 
 struct mdp4_kms {
         struct mdp_kms base;
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c
index a06b064f86c1..4a645926edb7 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c
@@ -16,10 +16,10 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mdp4_kms.h"
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
 
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
+#include "mdp4_kms.h"
 
 struct mdp4_lcdc_encoder {
         struct drm_encoder base;
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c
index 8dafc7bdba48..aa7402e03f67 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c
@@ -11,10 +11,10 @@
  * GNU General Public License for more details.
  */
 
-#include "mdp5_kms.h"
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
 
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
+#include "mdp5_kms.h"
 
 static struct mdp5_kms *get_kms(struct drm_encoder *encoder)
 {
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
index 9217e0d6e93e..0764a6498110 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
@@ -16,13 +16,13 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mdp5_kms.h"
-
 #include <linux/sort.h>
 #include <drm/drm_mode.h>
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
-#include "drm_flip_work.h"
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_flip_work.h>
+
+#include "mdp5_kms.h"
 
 #define CURSOR_WIDTH    64
 #define CURSOR_HEIGHT   64
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c
index c2ab0f033031..97f3294fbfc6 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c
@@ -16,10 +16,10 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mdp5_kms.h"
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
 
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
+#include "mdp5_kms.h"
 
 static struct mdp5_kms *get_kms(struct drm_encoder *encoder)
 {
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
index a38c5fe6cc19..5e7d9af4cba8 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
@@ -67,11 +67,11 @@ static void mdp5_plane_install_rotation_property(struct drm_device *dev,
                 struct drm_plane *plane)
 {
         drm_plane_create_rotation_property(plane,
-                                           DRM_ROTATE_0,
-                                           DRM_ROTATE_0 |
-                                           DRM_ROTATE_180 |
-                                           DRM_REFLECT_X |
-                                           DRM_REFLECT_Y);
+                                           DRM_MODE_ROTATE_0,
+                                           DRM_MODE_ROTATE_0 |
+                                           DRM_MODE_ROTATE_180 |
+                                           DRM_MODE_REFLECT_X |
+                                           DRM_MODE_REFLECT_Y);
 }
 
 /* helper to install properties which are common to planes and crtcs */
@@ -369,14 +369,14 @@ static int mdp5_plane_atomic_check_with_state(struct drm_crtc_state *crtc_state,
                         caps |= MDP_PIPE_CAP_SCALE;
 
                 rotation = drm_rotation_simplify(state->rotation,
-                                                 DRM_ROTATE_0 |
-                                                 DRM_REFLECT_X |
-                                                 DRM_REFLECT_Y);
+                                                 DRM_MODE_ROTATE_0 |
+                                                 DRM_MODE_REFLECT_X |
+                                                 DRM_MODE_REFLECT_Y);
 
-                if (rotation & DRM_REFLECT_X)
+                if (rotation & DRM_MODE_REFLECT_X)
                         caps |= MDP_PIPE_CAP_HFLIP;
 
-                if (rotation & DRM_REFLECT_Y)
+                if (rotation & DRM_MODE_REFLECT_Y)
                         caps |= MDP_PIPE_CAP_VFLIP;
 
                 if (plane->type == DRM_PLANE_TYPE_CURSOR)
@@ -970,11 +970,11 @@ static int mdp5_plane_mode_set(struct drm_plane *plane,
         DBG("scale config = %x", config);
 
         rotation = drm_rotation_simplify(pstate->rotation,
-                                         DRM_ROTATE_0 |
-                                         DRM_REFLECT_X |
-                                         DRM_REFLECT_Y);
-        hflip = !!(rotation & DRM_REFLECT_X);
-        vflip = !!(rotation & DRM_REFLECT_Y);
+                                         DRM_MODE_ROTATE_0 |
+                                         DRM_MODE_REFLECT_X |
+                                         DRM_MODE_REFLECT_Y);
+        hflip = !!(rotation & DRM_MODE_REFLECT_X);
+        vflip = !!(rotation & DRM_MODE_REFLECT_Y);
 
         spin_lock_irqsave(&mdp5_plane->pipe_lock, flags);
 
diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c
index 5cf165c9c3a9..ba2733a95a4f 100644
--- a/drivers/gpu/drm/msm/msm_fb.c
+++ b/drivers/gpu/drm/msm/msm_fb.c
@@ -15,12 +15,12 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+
 #include "msm_drv.h"
 #include "msm_kms.h"
 
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
-
 struct msm_framebuffer {
         struct drm_framebuffer base;
         const struct msm_format *format;
diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
index 951e40faf6e8..feea8ba4e05b 100644
--- a/drivers/gpu/drm/msm/msm_fbdev.c
+++ b/drivers/gpu/drm/msm/msm_fbdev.c
@@ -15,10 +15,10 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "msm_drv.h"
+#include <drm/drm_crtc.h>
+#include <drm/drm_fb_helper.h>
 
-#include "drm_crtc.h"
-#include "drm_fb_helper.h"
+#include "msm_drv.h"
 #include "msm_gem.h"
 
 extern int msm_gem_mmap_obj(struct drm_gem_object *obj,
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 68e509b3b9e4..465dab942afa 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -50,13 +50,13 @@ static struct page **get_pages_vram(struct drm_gem_object *obj,
         struct page **p;
         int ret, i;
 
-        p = drm_malloc_ab(npages, sizeof(struct page *));
+        p = kvmalloc_array(npages, sizeof(struct page *), GFP_KERNEL);
         if (!p)
                 return ERR_PTR(-ENOMEM);
 
         ret = drm_mm_insert_node(&priv->vram.mm, msm_obj->vram_node, npages);
         if (ret) {
-                drm_free_large(p);
+                kvfree(p);
                 return ERR_PTR(ret);
         }
 
@@ -127,7 +127,7 @@ static void put_pages(struct drm_gem_object *obj)
                         drm_gem_put_pages(obj, msm_obj->pages, true, false);
                 else {
                         drm_mm_remove_node(msm_obj->vram_node);
-                        drm_free_large(msm_obj->pages);
+                        kvfree(msm_obj->pages);
                 }
 
                 msm_obj->pages = NULL;
@@ -707,7 +707,7 @@ void msm_gem_free_object(struct drm_gem_object *obj)
                  * ours, just free the array we allocated:
                  */
                 if (msm_obj->pages)
-                        drm_free_large(msm_obj->pages);
+                        kvfree(msm_obj->pages);
 
                 drm_prime_gem_destroy(obj, msm_obj->sgt);
         } else {
@@ -863,7 +863,7 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev,
 
         msm_obj = to_msm_bo(obj);
         msm_obj->sgt = sgt;
-        msm_obj->pages = drm_malloc_ab(npages, sizeof(struct page *));
+        msm_obj->pages = kvmalloc_array(npages, sizeof(struct page *), GFP_KERNEL);
         if (!msm_obj->pages) {
                 ret = -ENOMEM;
                 goto fail;
diff --git a/drivers/gpu/drm/nouveau/Kbuild b/drivers/gpu/drm/nouveau/Kbuild
index fde6e3656636..2e9ce53ae3a8 100644
--- a/drivers/gpu/drm/nouveau/Kbuild
+++ b/drivers/gpu/drm/nouveau/Kbuild
@@ -1,4 +1,3 @@
-ccflags-y := -Iinclude/drm
 ccflags-y += -I$(src)/include
 ccflags-y += -I$(src)/include/nvkm
 ccflags-y += -I$(src)/nvkm
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 1f751a3f570c..c3dc75fee700 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -29,8 +29,8 @@
 #include <linux/pm_runtime.h>
 #include <linux/vga_switcheroo.h>
 
-#include "drmP.h"
-#include "drm_crtc_helper.h"
+#include <drm/drmP.h>
+#include <drm/drm_crtc_helper.h>
 
 #include <core/gpuobj.h>
 #include <core/option.h>
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index eadec2f49ad3..aaa25641fed6 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -43,7 +43,7 @@
 #include <nvif/device.h>
 #include <nvif/ioctl.h>
 
-#include <drmP.h>
+#include <drm/drmP.h>
 
 #include <drm/ttm/ttm_bo_api.h>
 #include <drm/ttm/ttm_bo_driver.h>
diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index 13e5cc5f07fe..999c35a25498 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
@@ -28,7 +28,7 @@
 #include "nouveau_ttm.h"
 #include "nouveau_gem.h"
 
-#include "drm_legacy.h"
+#include <drm/drm_legacy.h>
 
 #include <core/tegra.h>
 
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index a7663249b3ba..9303daa79aba 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -1033,7 +1033,7 @@ nv50_wndw_reset(struct drm_plane *plane)
                 plane->funcs->atomic_destroy_state(plane, plane->state);
         plane->state = &asyw->state;
         plane->state->plane = plane;
-        plane->state->rotation = DRM_ROTATE_0;
+        plane->state->rotation = DRM_MODE_ROTATE_0;
 }
 
 static void
diff --git a/drivers/gpu/drm/omapdrm/Makefile b/drivers/gpu/drm/omapdrm/Makefile
index 48b7b750c05c..b391be7ecb6c 100644
--- a/drivers/gpu/drm/omapdrm/Makefile
+++ b/drivers/gpu/drm/omapdrm/Makefile
@@ -6,7 +6,6 @@
 obj-y += dss/
 obj-y += displays/
 
-ccflags-y := -Iinclude/drm
 omapdrm-y := omap_drv.o \
         omap_irq.o \
         omap_debugfs.o \
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index e1f47f0b3ccf..663e930a7b0f 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -577,7 +577,7 @@ static void dev_lastclose(struct drm_device *dev)
 
                 drm_object_property_set_value(&crtc->base,
                                               crtc->primary->rotation_property,
-                                              DRM_ROTATE_0);
+                                              DRM_MODE_ROTATE_0);
         }
 
         for (i = 0; i < priv->num_planes; i++) {
@@ -588,7 +588,7 @@ static void dev_lastclose(struct drm_device *dev)
 
                 drm_object_property_set_value(&plane->base,
                                               plane->rotation_property,
-                                              DRM_ROTATE_0);
+                                              DRM_MODE_ROTATE_0);
         }
 
         if (priv->fbdev) {
diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c
index 29dc677dd4d3..5ca0537bb427 100644
--- a/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@ -167,30 +167,30 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb,
                 uint32_t w = win->src_w;
                 uint32_t h = win->src_h;
 
-                switch (win->rotation & DRM_ROTATE_MASK) {
+                switch (win->rotation & DRM_MODE_ROTATE_MASK) {
                 default:
                         dev_err(fb->dev->dev, "invalid rotation: %02x",
                                         (uint32_t)win->rotation);
                         /* fallthru to default to no rotation */
                 case 0:
-                case DRM_ROTATE_0:
+                case DRM_MODE_ROTATE_0:
                         orient = 0;
                         break;
-                case DRM_ROTATE_90:
+                case DRM_MODE_ROTATE_90:
                         orient = MASK_XY_FLIP | MASK_X_INVERT;
                         break;
-                case DRM_ROTATE_180:
+                case DRM_MODE_ROTATE_180:
                         orient = MASK_X_INVERT | MASK_Y_INVERT;
                         break;
-                case DRM_ROTATE_270:
+                case DRM_MODE_ROTATE_270:
                         orient = MASK_XY_FLIP | MASK_Y_INVERT;
                         break;
                 }
 
-                if (win->rotation & DRM_REFLECT_X)
+                if (win->rotation & DRM_MODE_REFLECT_X)
                         orient ^= MASK_X_INVERT;
 
-                if (win->rotation & DRM_REFLECT_Y)
+                if (win->rotation & DRM_MODE_REFLECT_Y)
                         orient ^= MASK_Y_INVERT;
 
                 /* adjust x,y offset for flip/invert: */
@@ -205,9 +205,9 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb,
                 info->rotation_type = OMAP_DSS_ROT_TILER;
                 info->screen_width  = omap_gem_tiled_stride(plane->bo, orient);
         } else {
-                switch (win->rotation & DRM_ROTATE_MASK) {
+                switch (win->rotation & DRM_MODE_ROTATE_MASK) {
                 case 0:
-                case DRM_ROTATE_0:
+                case DRM_MODE_ROTATE_0:
                         /* OK */
                         break;
 
diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index 9168154d749e..d3d6818c68f8 100644
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -141,7 +141,7 @@ static void omap_plane_atomic_disable(struct drm_plane *plane,
         struct omap_plane_state *omap_state = to_omap_plane_state(plane->state);
         struct omap_plane *omap_plane = to_omap_plane(plane);
 
-        plane->state->rotation = DRM_ROTATE_0;
+        plane->state->rotation = DRM_MODE_ROTATE_0;
         omap_state->zorder = plane->type == DRM_PLANE_TYPE_PRIMARY
                            ? 0 : omap_plane->id;
 
@@ -177,7 +177,7 @@ static int omap_plane_atomic_check(struct drm_plane *plane,
         if (state->crtc_y + state->crtc_h > crtc_state->adjusted_mode.vdisplay)
                 return -EINVAL;
 
-        if (state->rotation != DRM_ROTATE_0 &&
+        if (state->rotation != DRM_MODE_ROTATE_0 &&
             !omap_framebuffer_supports_rotation(state->fb))
                 return -EINVAL;
 
@@ -213,15 +213,15 @@ void omap_plane_install_properties(struct drm_plane *plane,
         if (priv->has_dmm) {
                 if (!plane->rotation_property)
                         drm_plane_create_rotation_property(plane,
-                                                           DRM_ROTATE_0,
-                                                           DRM_ROTATE_0 | DRM_ROTATE_90 |
-                                                           DRM_ROTATE_180 | DRM_ROTATE_270 |
-                                                           DRM_REFLECT_X | DRM_REFLECT_Y);
+                                                           DRM_MODE_ROTATE_0,
+                                                           DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_90 |
+                                                           DRM_MODE_ROTATE_180 | DRM_MODE_ROTATE_270 |
+                                                           DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y);
 
                 /* Attach the rotation property also to the crtc object */
                 if (plane->rotation_property && obj != &plane->base)
                         drm_object_attach_property(obj, plane->rotation_property,
-                                                   DRM_ROTATE_0);
+                                                   DRM_MODE_ROTATE_0);
         }
 
         drm_object_attach_property(obj, priv->zorder_prop, 0);
@@ -273,7 +273,7 @@ static void omap_plane_reset(struct drm_plane *plane)
          */
         omap_state->zorder = plane->type == DRM_PLANE_TYPE_PRIMARY
                            ? 0 : omap_plane->id;
-        omap_state->base.rotation = DRM_ROTATE_0;
+        omap_state->base.rotation = DRM_MODE_ROTATE_0;
 
         plane->state = &omap_state->base;
         plane->state->plane = plane;
diff --git a/drivers/gpu/drm/pl111/Kconfig b/drivers/gpu/drm/pl111/Kconfig
index ede49efd531f..309f4fd52de7 100644
--- a/drivers/gpu/drm/pl111/Kconfig
+++ b/drivers/gpu/drm/pl111/Kconfig
@@ -2,6 +2,7 @@ config DRM_PL111
         tristate "DRM Support for PL111 CLCD Controller"
         depends on DRM
         depends on ARM || ARM64 || COMPILE_TEST
+        depends on COMMON_CLK
         select DRM_KMS_HELPER
         select DRM_KMS_CMA_HELPER
         select DRM_GEM_CMA_HELPER
diff --git a/drivers/gpu/drm/pl111/Makefile b/drivers/gpu/drm/pl111/Makefile
index 01caee727c13..59483d610ef5 100644
--- a/drivers/gpu/drm/pl111/Makefile
+++ b/drivers/gpu/drm/pl111/Makefile
@@ -2,4 +2,6 @@ pl111_drm-y +=	pl111_connector.o \
                 pl111_display.o \
                 pl111_drv.o
 
+pl111_drm-$(CONFIG_DEBUG_FS) += pl111_debugfs.o
+
 obj-$(CONFIG_DRM_PL111) += pl111_drm.o
diff --git a/drivers/gpu/drm/pl111/pl111_debugfs.c b/drivers/gpu/drm/pl111/pl111_debugfs.c
new file mode 100644
index 000000000000..0d9dee199b2c
--- /dev/null
+++ b/drivers/gpu/drm/pl111/pl111_debugfs.c
@@ -0,0 +1,55 @@
+/*
+ *  Copyright © 2017 Broadcom
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/amba/clcd-regs.h>
+#include <linux/seq_file.h>
+#include <drm/drm_debugfs.h>
+#include <drm/drmP.h>
+#include "pl111_drm.h"
+
+#define REGDEF(reg) { reg, #reg }
+static const struct {
+        u32 reg;
+        const char *name;
+} pl111_reg_defs[] = {
+        REGDEF(CLCD_TIM0),
+        REGDEF(CLCD_TIM1),
+        REGDEF(CLCD_TIM2),
+        REGDEF(CLCD_TIM3),
+        REGDEF(CLCD_UBAS),
+        REGDEF(CLCD_PL111_CNTL),
+        REGDEF(CLCD_PL111_IENB),
+};
+
+int pl111_debugfs_regs(struct seq_file *m, void *unused)
+{
+        struct drm_info_node *node = (struct drm_info_node *)m->private;
+        struct drm_device *dev = node->minor->dev;
+        struct pl111_drm_dev_private *priv = dev->dev_private;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(pl111_reg_defs); i++) {
+                seq_printf(m, "%s (0x%04x): 0x%08x\n",
+                           pl111_reg_defs[i].name, pl111_reg_defs[i].reg,
+                           readl(priv->regs + pl111_reg_defs[i].reg));
+        }
+
+        return 0;
+}
+
+static const struct drm_info_list pl111_debugfs_list[] = {
+        {"regs", pl111_debugfs_regs, 0},
+};
+
+int
+pl111_debugfs_init(struct drm_minor *minor)
+{
+        return drm_debugfs_create_files(pl111_debugfs_list,
+                                        ARRAY_SIZE(pl111_debugfs_list),
+                                        minor->debugfs_root, minor);
+}
diff --git a/drivers/gpu/drm/pl111/pl111_display.c b/drivers/gpu/drm/pl111/pl111_display.c
index 39a5c33bce7d..3e0a4fa73ddb 100644
--- a/drivers/gpu/drm/pl111/pl111_display.c
+++ b/drivers/gpu/drm/pl111/pl111_display.c
@@ -108,7 +108,7 @@ static void pl111_display_enable(struct drm_simple_display_pipe *pipe,
         u32 cntl;
         u32 ppl, hsw, hfp, hbp;
         u32 lpp, vsw, vfp, vbp;
-        u32 cpl;
+        u32 cpl, tim2;
         int ret;
 
         ret = clk_set_rate(priv->clk, mode->clock * 1000);
@@ -142,20 +142,28 @@ static void pl111_display_enable(struct drm_simple_display_pipe *pipe,
                (vfp << 16) |
                (vbp << 24),
                priv->regs + CLCD_TIM1);
-        /* XXX: We currently always use CLCDCLK with no divisor.  We
-         * could probably reduce power consumption by using HCLK
-         * (apb_pclk) with a divisor when it gets us near our target
-         * pixel clock.
-         */
-        writel(((mode->flags & DRM_MODE_FLAG_NHSYNC) ? TIM2_IHS : 0) |
-               ((mode->flags & DRM_MODE_FLAG_NVSYNC) ? TIM2_IVS : 0) |
-               ((connector->display_info.bus_flags &
-                 DRM_BUS_FLAG_DE_LOW) ? TIM2_IOE : 0) |
-               ((connector->display_info.bus_flags &
-                 DRM_BUS_FLAG_PIXDATA_NEGEDGE) ? TIM2_IPC : 0) |
-               TIM2_BCD |
-               (cpl << 16),
-               priv->regs + CLCD_TIM2);
+
+        spin_lock(&priv->tim2_lock);
+
+        tim2 = readl(priv->regs + CLCD_TIM2);
+        tim2 &= (TIM2_BCD | TIM2_PCD_LO_MASK | TIM2_PCD_HI_MASK);
+
+        if (mode->flags & DRM_MODE_FLAG_NHSYNC)
+                tim2 |= TIM2_IHS;
+
+        if (mode->flags & DRM_MODE_FLAG_NVSYNC)
+                tim2 |= TIM2_IVS;
+
+        if (connector->display_info.bus_flags & DRM_BUS_FLAG_DE_LOW)
+                tim2 |= TIM2_IOE;
+
+        if (connector->display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_NEGEDGE)
+                tim2 |= TIM2_IPC;
+
+        tim2 |= cpl << 16;
+        writel(tim2, priv->regs + CLCD_TIM2);
+        spin_unlock(&priv->tim2_lock);
+
         writel(0, priv->regs + CLCD_TIM3);
 
         drm_panel_prepare(priv->connector.panel);
@@ -280,7 +288,7 @@ static int pl111_display_prepare_fb(struct drm_simple_display_pipe *pipe,
         return drm_fb_cma_prepare_fb(&pipe->plane, plane_state);
 }
 
-const struct drm_simple_display_pipe_funcs pl111_display_funcs = {
+static const struct drm_simple_display_pipe_funcs pl111_display_funcs = {
         .check = pl111_display_check,
         .enable = pl111_display_enable,
         .disable = pl111_display_disable,
@@ -288,6 +296,126 @@ const struct drm_simple_display_pipe_funcs pl111_display_funcs = {
         .prepare_fb = pl111_display_prepare_fb,
 };
 
+static int pl111_clk_div_choose_div(struct clk_hw *hw, unsigned long rate,
+                                    unsigned long *prate, bool set_parent)
+{
+        int best_div = 1, div;
+        struct clk_hw *parent = clk_hw_get_parent(hw);
+        unsigned long best_prate = 0;
+        unsigned long best_diff = ~0ul;
+        int max_div = (1 << (TIM2_PCD_LO_BITS + TIM2_PCD_HI_BITS)) - 1;
+
+        for (div = 1; div < max_div; div++) {
+                unsigned long this_prate, div_rate, diff;
+
+                if (set_parent)
+                        this_prate = clk_hw_round_rate(parent, rate * div);
+                else
+                        this_prate = *prate;
+                div_rate = DIV_ROUND_UP_ULL(this_prate, div);
+                diff = abs(rate - div_rate);
+
+                if (diff < best_diff) {
+                        best_div = div;
+                        best_diff = diff;
+                        best_prate = this_prate;
+                }
+        }
+
+        *prate = best_prate;
+        return best_div;
+}
+
+static long pl111_clk_div_round_rate(struct clk_hw *hw, unsigned long rate,
+                                     unsigned long *prate)
+{
+        int div = pl111_clk_div_choose_div(hw, rate, prate, true);
+
+        return DIV_ROUND_UP_ULL(*prate, div);
+}
+
+static unsigned long pl111_clk_div_recalc_rate(struct clk_hw *hw,
+                                               unsigned long prate)
+{
+        struct pl111_drm_dev_private *priv =
+                container_of(hw, struct pl111_drm_dev_private, clk_div);
+        u32 tim2 = readl(priv->regs + CLCD_TIM2);
+        int div;
+
+        if (tim2 & TIM2_BCD)
+                return prate;
+
+        div = tim2 & TIM2_PCD_LO_MASK;
+        div |= (tim2 & TIM2_PCD_HI_MASK) >>
+                (TIM2_PCD_HI_SHIFT - TIM2_PCD_LO_BITS);
+        div += 2;
+
+        return DIV_ROUND_UP_ULL(prate, div);
+}
+
+static int pl111_clk_div_set_rate(struct clk_hw *hw, unsigned long rate,
+                                  unsigned long prate)
+{
+        struct pl111_drm_dev_private *priv =
+                container_of(hw, struct pl111_drm_dev_private, clk_div);
+        int div = pl111_clk_div_choose_div(hw, rate, &prate, false);
+        u32 tim2;
+
+        spin_lock(&priv->tim2_lock);
+        tim2 = readl(priv->regs + CLCD_TIM2);
+        tim2 &= ~(TIM2_BCD | TIM2_PCD_LO_MASK | TIM2_PCD_HI_MASK);
+
+        if (div == 1) {
+                tim2 |= TIM2_BCD;
+        } else {
+                div -= 2;
+                tim2 |= div & TIM2_PCD_LO_MASK;
+                tim2 |= (div >> TIM2_PCD_LO_BITS) << TIM2_PCD_HI_SHIFT;
+        }
+
+        writel(tim2, priv->regs + CLCD_TIM2);
+        spin_unlock(&priv->tim2_lock);
+
+        return 0;
+}
+
+static const struct clk_ops pl111_clk_div_ops = {
+        .recalc_rate = pl111_clk_div_recalc_rate,
+        .round_rate = pl111_clk_div_round_rate,
+        .set_rate = pl111_clk_div_set_rate,
+};
+
+static int
+pl111_init_clock_divider(struct drm_device *drm)
+{
+        struct pl111_drm_dev_private *priv = drm->dev_private;
+        struct clk *parent = devm_clk_get(drm->dev, "clcdclk");
+        struct clk_hw *div = &priv->clk_div;
+        const char *parent_name;
+        struct clk_init_data init = {
+                .name = "pl111_div",
+                .ops = &pl111_clk_div_ops,
+                .parent_names = &parent_name,
+                .num_parents = 1,
+                .flags = CLK_SET_RATE_PARENT,
+        };
+        int ret;
+
+        if (IS_ERR(parent)) {
+                dev_err(drm->dev, "CLCD: unable to get clcdclk.\n");
+                return PTR_ERR(parent);
+        }
+        parent_name = __clk_get_name(parent);
+
+        spin_lock_init(&priv->tim2_lock);
+        div->init = &init;
+
+        ret = devm_clk_hw_register(drm->dev, div);
+
+        priv->clk = div->clk;
+        return ret;
+}
+
 int pl111_display_init(struct drm_device *drm)
 {
         struct pl111_drm_dev_private *priv = drm->dev_private;
@@ -333,6 +461,10 @@ int pl111_display_init(struct drm_device *drm)
                 return -EINVAL;
         }
 
+        ret = pl111_init_clock_divider(drm);
+        if (ret)
+                return ret;
+
         ret = drm_simple_display_pipe_init(drm, &priv->pipe,
                                            &pl111_display_funcs,
                                            formats, ARRAY_SIZE(formats),
diff --git a/drivers/gpu/drm/pl111/pl111_drm.h b/drivers/gpu/drm/pl111/pl111_drm.h
index f381593921b7..5c685bfc8fdc 100644
--- a/drivers/gpu/drm/pl111/pl111_drm.h
+++ b/drivers/gpu/drm/pl111/pl111_drm.h
@@ -21,9 +21,12 @@
 
 #include <drm/drm_gem.h>
 #include <drm/drm_simple_kms_helper.h>
+#include <linux/clk-provider.h>
 
 #define CLCD_IRQ_NEXTBASE_UPDATE BIT(2)
 
+struct drm_minor;
+
 struct pl111_drm_connector {
         struct drm_connector connector;
         struct drm_panel *panel;
@@ -37,7 +40,14 @@ struct pl111_drm_dev_private {
         struct drm_fbdev_cma *fbdev;
 
         void *regs;
+        /* The pixel clock (a reference to our clock divider off of CLCDCLK). */
         struct clk *clk;
+        /* pl111's internal clock divider. */
+        struct clk_hw clk_div;
+        /* Lock to sync access to CLCD_TIM2 between the common clock
+         * subsystem and pl111_display_enable().
+         */
+        spinlock_t tim2_lock;
 };
 
 #define to_pl111_connector(x) \
@@ -52,5 +62,6 @@ int pl111_encoder_init(struct drm_device *dev);
 int pl111_dumb_create(struct drm_file *file_priv,
                       struct drm_device *dev,
                       struct drm_mode_create_dumb *args);
+int pl111_debugfs_init(struct drm_minor *minor);
 
 #endif /* _PL111_DRM_H_ */
diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c
index 936403f65508..e96efad37d27 100644
--- a/drivers/gpu/drm/pl111/pl111_drv.c
+++ b/drivers/gpu/drm/pl111/pl111_drv.c
@@ -50,8 +50,8 @@
  * - Read back hardware state at boot to skip reprogramming the
  *   hardware when doing a no-op modeset.
  *
- * - Use the internal clock divisor to reduce power consumption by
- *   using HCLK (apb_pclk) when appropriate.
+ * - Use the CLKSEL bit to support switching between the two external
+ *   clock parents.
  */
 
 #include <linux/amba/bus.h>
@@ -72,7 +72,7 @@
 
 #define DRIVER_DESC      "DRM module for PL111"
 
-struct drm_mode_config_funcs mode_config_funcs = {
+static struct drm_mode_config_funcs mode_config_funcs = {
         .fb_create = drm_fb_cma_create,
         .atomic_check = drm_atomic_helper_check,
         .atomic_commit = drm_atomic_helper_commit,
@@ -173,6 +173,10 @@ static struct drm_driver pl111_drm_driver = {
         .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
         .gem_prime_export = drm_gem_prime_export,
         .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
+
+#if defined(CONFIG_DEBUG_FS)
+        .debugfs_init = pl111_debugfs_init,
+#endif
 };
 
 #ifdef CONFIG_ARM_AMBA
@@ -195,17 +199,10 @@ static int pl111_amba_probe(struct amba_device *amba_dev,
         priv->drm = drm;
         drm->dev_private = priv;
 
-        priv->clk = devm_clk_get(dev, "clcdclk");
-        if (IS_ERR(priv->clk)) {
-                dev_err(dev, "CLCD: unable to get clk.\n");
-                ret = PTR_ERR(priv->clk);
-                goto dev_unref;
-        }
-
         priv->regs = devm_ioremap_resource(dev, &amba_dev->res);
-        if (!priv->regs) {
+        if (IS_ERR(priv->regs)) {
                 dev_err(dev, "%s failed mmio\n", __func__);
-                return -EINVAL;
+                return PTR_ERR(priv->regs);
         }
 
         /* turn off interrupts before requesting the irq */
diff --git a/drivers/gpu/drm/qxl/Makefile b/drivers/gpu/drm/qxl/Makefile
index bacc4aff1201..33a7d0c434b7 100644
--- a/drivers/gpu/drm/qxl/Makefile
+++ b/drivers/gpu/drm/qxl/Makefile
@@ -2,8 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y := -Iinclude/drm
-
 qxl-y := qxl_drv.o qxl_kms.o qxl_display.o qxl_ttm.o qxl_fb.o qxl_object.o qxl_gem.o qxl_cmd.o qxl_image.o qxl_draw.o qxl_debugfs.o qxl_irq.o qxl_dumb.o qxl_ioctl.o qxl_release.o qxl_prime.o
 
 obj-$(CONFIG_DRM_QXL)+= qxl.o
diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
index ffe821b61f7d..15c84068d3fb 100644
--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
@@ -30,7 +30,7 @@
 
 #include <linux/debugfs.h>
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "qxl_drv.h"
 #include "qxl_object.h"
 
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index 058340a002c2..f5ef81595f5a 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -23,16 +23,15 @@
  *          Alon Levy
  */
 
-
 #include <linux/crc32.h>
-
-#include "qxl_drv.h"
-#include "qxl_object.h"
-#include "drm_crtc_helper.h"
+#include <drm/drm_crtc_helper.h>
 #include <drm/drm_plane_helper.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_atomic.h>
 
+#include "qxl_drv.h"
+#include "qxl_object.h"
+
 static bool qxl_head_enabled(struct qxl_head *head)
 {
         return head->width && head->height;
diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c
index abf7b8360361..c2fc201d9e1b 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.c
+++ b/drivers/gpu/drm/qxl/qxl_drv.c
@@ -31,9 +31,9 @@
 #include <linux/module.h>
 #include <linux/console.h>
 
-#include "drmP.h"
-#include "drm/drm.h"
-#include "drm_crtc_helper.h"
+#include <drm/drmP.h>
+#include <drm/drm.h>
+#include <drm/drm_crtc_helper.h>
 #include "qxl_drv.h"
 #include "qxl_object.h"
 
diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
index 5ea290a33a68..3591d2330a09 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.h
+++ b/drivers/gpu/drm/qxl/qxl_drv.h
@@ -36,20 +36,18 @@
 #include <linux/firmware.h>
 #include <linux/platform_device.h>
 
-#include "drmP.h"
-#include "drm_crtc.h"
-#include <ttm/ttm_bo_api.h>
-#include <ttm/ttm_bo_driver.h>
-#include <ttm/ttm_placement.h>
-#include <ttm/ttm_module.h>
-
+#include <drm/drm_crtc.h>
 #include <drm/drm_encoder.h>
 #include <drm/drm_gem.h>
-
+#include <drm/drmP.h>
+#include <drm/ttm/ttm_bo_api.h>
+#include <drm/ttm/ttm_bo_driver.h>
 /* just for ttm_validate_buffer */
-#include <ttm/ttm_execbuf_util.h>
-
+#include <drm/ttm/ttm_execbuf_util.h>
+#include <drm/ttm/ttm_module.h>
+#include <drm/ttm/ttm_placement.h>
 #include <drm/qxl_drm.h>
+
 #include "qxl_dev.h"
 
 #define DRIVER_AUTHOR           "Dave Airlie"
diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c
index 14e2a49a4dcf..573e7e9a5f98 100644
--- a/drivers/gpu/drm/qxl/qxl_fb.c
+++ b/drivers/gpu/drm/qxl/qxl_fb.c
@@ -25,14 +25,15 @@
  */
 #include <linux/module.h>
 
-#include "drmP.h"
-#include "drm/drm.h"
-#include "drm/drm_crtc.h"
-#include "drm/drm_crtc_helper.h"
+#include <drm/drmP.h>
+#include <drm/drm.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_fb_helper.h>
+
 #include "qxl_drv.h"
 
 #include "qxl_object.h"
-#include "drm_fb_helper.h"
 
 #define QXL_DIRTY_DELAY (HZ / 30)
 
diff --git a/drivers/gpu/drm/qxl/qxl_gem.c b/drivers/gpu/drm/qxl/qxl_gem.c
index 3f185c4da5b7..85f546719adb 100644
--- a/drivers/gpu/drm/qxl/qxl_gem.c
+++ b/drivers/gpu/drm/qxl/qxl_gem.c
@@ -23,8 +23,9 @@
  *          Alon Levy
  */
 
-#include "drmP.h"
-#include "drm/drm.h"
+#include <drm/drmP.h>
+#include <drm/drm.h>
+
 #include "qxl_drv.h"
 #include "qxl_object.h"
 
diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
index 0fdedee4509d..87fc1dbd0a2f 100644
--- a/drivers/gpu/drm/qxl/qxl_ttm.c
+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
@@ -23,11 +23,11 @@
  *          Alon Levy
  */
 
-#include <ttm/ttm_bo_api.h>
-#include <ttm/ttm_bo_driver.h>
-#include <ttm/ttm_placement.h>
-#include <ttm/ttm_page_alloc.h>
-#include <ttm/ttm_module.h>
+#include <drm/ttm/ttm_bo_api.h>
+#include <drm/ttm/ttm_bo_driver.h>
+#include <drm/ttm/ttm_placement.h>
+#include <drm/ttm/ttm_page_alloc.h>
+#include <drm/ttm/ttm_module.h>
 #include <drm/drmP.h>
 #include <drm/drm.h>
 #include <drm/qxl_drm.h>
diff --git a/drivers/gpu/drm/r128/Makefile b/drivers/gpu/drm/r128/Makefile
index 1cc72ae3a880..1a6700ebaf09 100644
--- a/drivers/gpu/drm/r128/Makefile
+++ b/drivers/gpu/drm/r128/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y := -Iinclude/drm
 r128-y   := r128_drv.o r128_cce.o r128_state.o r128_irq.o
 
 r128-$(CONFIG_COMPAT)   += r128_ioc32.o
diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile
index 08bd17d3925c..a5d3cd3ecb5f 100644
--- a/drivers/gpu/drm/radeon/Makefile
+++ b/drivers/gpu/drm/radeon/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/amd/include
+ccflags-y := -Idrivers/gpu/drm/amd/include
 
 hostprogs-y := mkregtable
 clean-files := rn50_reg_safe.h r100_reg_safe.h r200_reg_safe.h rv515_reg_safe.h r300_reg_safe.h r420_reg_safe.h rs600_reg_safe.h r600_reg_safe.h evergreen_reg_safe.h cayman_reg_safe.h
diff --git a/drivers/gpu/drm/radeon/btc_dpm.c b/drivers/gpu/drm/radeon/btc_dpm.c
index 38e5123708e7..95652e643da1 100644
--- a/drivers/gpu/drm/radeon/btc_dpm.c
+++ b/drivers/gpu/drm/radeon/btc_dpm.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "btcd.h"
diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c
index 7ba450832e6b..f0cf99783c62 100644
--- a/drivers/gpu/drm/radeon/ci_dpm.c
+++ b/drivers/gpu/drm/radeon/ci_dpm.c
@@ -22,7 +22,7 @@
  */
 
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "radeon_ucode.h"
diff --git a/drivers/gpu/drm/radeon/ci_smc.c b/drivers/gpu/drm/radeon/ci_smc.c
index 24760ee3063e..3356a21d97ec 100644
--- a/drivers/gpu/drm/radeon/ci_smc.c
+++ b/drivers/gpu/drm/radeon/ci_smc.c
@@ -23,7 +23,7 @@
  */
 
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "cikd.h"
 #include "ppsmc.h"
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index ccebe0f8d2e1..e368ce22bcc4 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -24,7 +24,7 @@
 #include <linux/firmware.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "radeon_audio.h"
diff --git a/drivers/gpu/drm/radeon/cypress_dpm.c b/drivers/gpu/drm/radeon/cypress_dpm.c
index a4edd0702718..3eb7899a4035 100644
--- a/drivers/gpu/drm/radeon/cypress_dpm.c
+++ b/drivers/gpu/drm/radeon/cypress_dpm.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "evergreend.h"
diff --git a/drivers/gpu/drm/radeon/kv_dpm.c b/drivers/gpu/drm/radeon/kv_dpm.c
index a7e978677937..ae1529b0ef6f 100644
--- a/drivers/gpu/drm/radeon/kv_dpm.c
+++ b/drivers/gpu/drm/radeon/kv_dpm.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "cikd.h"
 #include "r600_dpm.h"
diff --git a/drivers/gpu/drm/radeon/kv_smc.c b/drivers/gpu/drm/radeon/kv_smc.c
index 0000b59a6d05..af60bd32a287 100644
--- a/drivers/gpu/drm/radeon/kv_smc.c
+++ b/drivers/gpu/drm/radeon/kv_smc.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "cikd.h"
 #include "kv_dpm.h"
diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c
index 4a601f990562..9416e72f86aa 100644
--- a/drivers/gpu/drm/radeon/ni_dpm.c
+++ b/drivers/gpu/drm/radeon/ni_dpm.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "nid.h"
diff --git a/drivers/gpu/drm/radeon/r600_dpm.c b/drivers/gpu/drm/radeon/r600_dpm.c
index c7fc1dbfd192..31d1b4710844 100644
--- a/drivers/gpu/drm/radeon/r600_dpm.c
+++ b/drivers/gpu/drm/radeon/r600_dpm.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "r600d.h"
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index c1c8e2208a21..342e3b1fb9c7 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -68,11 +68,11 @@
 #include <linux/hashtable.h>
 #include <linux/dma-fence.h>
 
-#include <ttm/ttm_bo_api.h>
-#include <ttm/ttm_bo_driver.h>
-#include <ttm/ttm_placement.h>
-#include <ttm/ttm_module.h>
-#include <ttm/ttm_execbuf_util.h>
+#include <drm/ttm/ttm_bo_api.h>
+#include <drm/ttm/ttm_bo_driver.h>
+#include <drm/ttm/ttm_placement.h>
+#include <drm/ttm/ttm_module.h>
+#include <drm/ttm/ttm_execbuf_util.h>
 
 #include <drm/drm_gem.h>
 
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index 3ac671f6c8e1..00b22af70f5c 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -87,7 +87,8 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
         p->dma_reloc_idx = 0;
         /* FIXME: we assume that each relocs use 4 dwords */
         p->nrelocs = chunk->length_dw / 4;
-        p->relocs = drm_calloc_large(p->nrelocs, sizeof(struct radeon_bo_list));
+        p->relocs = kvmalloc_array(p->nrelocs, sizeof(struct radeon_bo_list),
+                        GFP_KERNEL | __GFP_ZERO);
         if (p->relocs == NULL) {
                 return -ENOMEM;
         }
@@ -341,7 +342,7 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data)
                                 continue;
                 }
 
-                p->chunks[i].kdata = drm_malloc_ab(size, sizeof(uint32_t));
+                p->chunks[i].kdata = kvmalloc_array(size, sizeof(uint32_t), GFP_KERNEL);
                 size *= sizeof(uint32_t);
                 if (p->chunks[i].kdata == NULL) {
                         return -ENOMEM;
@@ -440,10 +441,10 @@ static void radeon_cs_parser_fini(struct radeon_cs_parser *parser, int error, bo
                 }
         }
         kfree(parser->track);
-        drm_free_large(parser->relocs);
-        drm_free_large(parser->vm_bos);
+        kvfree(parser->relocs);
+        kvfree(parser->vm_bos);
         for (i = 0; i < parser->nchunks; i++)
-                drm_free_large(parser->chunks[i].kdata);
+                kvfree(parser->chunks[i].kdata);
         kfree(parser->chunks);
         kfree(parser->chunks_array);
         radeon_ib_free(parser->rdev, &parser->ib);
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index ef8a75940980..6f906abd612b 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -41,7 +41,7 @@
 #include <drm/drm_gem.h>
 #include <drm/drm_fb_helper.h>
 
-#include "drm_crtc_helper.h"
+#include <drm/drm_crtc_helper.h>
 #include "radeon_kfd.h"
 
 /*
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index dddb372de2b9..574bf7e6b118 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -587,7 +587,7 @@ error_unreserve:
         ttm_eu_backoff_reservation(&ticket, &list);
 
 error_free:
-        drm_free_large(vm_bos);
+        kvfree(vm_bos);
 
         if (r && r != -ERESTARTSYS)
                 DRM_ERROR("Couldn't update BO_VA (%d)\n", r);
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index 8c7872339c2a..84802b201bef 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -314,7 +314,7 @@ unsigned radeon_ring_backup(struct radeon_device *rdev, struct radeon_ring *ring
         }
 
         /* and then save the content of the ring */
-        *data = drm_malloc_ab(size, sizeof(uint32_t));
+        *data = kvmalloc_array(size, sizeof(uint32_t), GFP_KERNEL);
         if (!*data) {
                 mutex_unlock(&rdev->ring_lock);
                 return 0;
@@ -356,7 +356,7 @@ int radeon_ring_restore(struct radeon_device *rdev, struct radeon_ring *ring,
         }
 
         radeon_ring_unlock_commit(rdev, ring, false);
-        drm_free_large(data);
+        kvfree(data);
         return 0;
 }
 
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 8b7623b5a624..faa021396da3 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -29,11 +29,11 @@
  *    Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
  *    Dave Airlie
  */
-#include <ttm/ttm_bo_api.h>
-#include <ttm/ttm_bo_driver.h>
-#include <ttm/ttm_placement.h>
-#include <ttm/ttm_module.h>
-#include <ttm/ttm_page_alloc.h>
+#include <drm/ttm/ttm_bo_api.h>
+#include <drm/ttm/ttm_bo_driver.h>
+#include <drm/ttm/ttm_placement.h>
+#include <drm/ttm/ttm_module.h>
+#include <drm/ttm/ttm_page_alloc.h>
 #include <drm/drmP.h>
 #include <drm/radeon_drm.h>
 #include <linux/seq_file.h>
diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
index a1358748cea5..5f68245579a3 100644
--- a/drivers/gpu/drm/radeon/radeon_vm.c
+++ b/drivers/gpu/drm/radeon/radeon_vm.c
@@ -132,8 +132,8 @@ struct radeon_bo_list *radeon_vm_get_bos(struct radeon_device *rdev,
         struct radeon_bo_list *list;
         unsigned i, idx;
 
-        list = drm_malloc_ab(vm->max_pde_used + 2,
-                             sizeof(struct radeon_bo_list));
+        list = kvmalloc_array(vm->max_pde_used + 2,
+                             sizeof(struct radeon_bo_list), GFP_KERNEL);
         if (!list)
                 return NULL;
 
diff --git a/drivers/gpu/drm/radeon/rs780_dpm.c b/drivers/gpu/drm/radeon/rs780_dpm.c
index 94b48fc1e266..b5e4e09a8996 100644
--- a/drivers/gpu/drm/radeon/rs780_dpm.c
+++ b/drivers/gpu/drm/radeon/rs780_dpm.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "rs780d.h"
diff --git a/drivers/gpu/drm/radeon/rv6xx_dpm.c b/drivers/gpu/drm/radeon/rv6xx_dpm.c
index 25e29303b119..d91aa3944593 100644
--- a/drivers/gpu/drm/radeon/rv6xx_dpm.c
+++ b/drivers/gpu/drm/radeon/rv6xx_dpm.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "rv6xxd.h"
diff --git a/drivers/gpu/drm/radeon/rv730_dpm.c b/drivers/gpu/drm/radeon/rv730_dpm.c
index d37ba2cb886e..38fdb4152e2a 100644
--- a/drivers/gpu/drm/radeon/rv730_dpm.c
+++ b/drivers/gpu/drm/radeon/rv730_dpm.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "rv730d.h"
 #include "r600_dpm.h"
diff --git a/drivers/gpu/drm/radeon/rv740_dpm.c b/drivers/gpu/drm/radeon/rv740_dpm.c
index 4b850824fe06..afd597ec5085 100644
--- a/drivers/gpu/drm/radeon/rv740_dpm.c
+++ b/drivers/gpu/drm/radeon/rv740_dpm.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "rv740d.h"
 #include "r600_dpm.h"
diff --git a/drivers/gpu/drm/radeon/rv770_dpm.c b/drivers/gpu/drm/radeon/rv770_dpm.c
index a010decf59af..cb2a7ec4e217 100644
--- a/drivers/gpu/drm/radeon/rv770_dpm.c
+++ b/drivers/gpu/drm/radeon/rv770_dpm.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "rv770d.h"
diff --git a/drivers/gpu/drm/radeon/rv770_smc.c b/drivers/gpu/drm/radeon/rv770_smc.c
index b2a224407365..2b7ddee3984c 100644
--- a/drivers/gpu/drm/radeon/rv770_smc.c
+++ b/drivers/gpu/drm/radeon/rv770_smc.c
@@ -23,7 +23,7 @@
  */
 
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "rv770d.h"
 #include "rv770_dpm.h"
diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c
index c7af9fdd20c7..ee3e74266a13 100644
--- a/drivers/gpu/drm/radeon/si_dpm.c
+++ b/drivers/gpu/drm/radeon/si_dpm.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "sid.h"
diff --git a/drivers/gpu/drm/radeon/si_smc.c b/drivers/gpu/drm/radeon/si_smc.c
index e5bb92f16775..51155abda8d8 100644
--- a/drivers/gpu/drm/radeon/si_smc.c
+++ b/drivers/gpu/drm/radeon/si_smc.c
@@ -23,7 +23,7 @@
  */
 
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "sid.h"
 #include "ppsmc.h"
diff --git a/drivers/gpu/drm/radeon/sumo_dpm.c b/drivers/gpu/drm/radeon/sumo_dpm.c
index f0d5c1724f55..fd4804829e46 100644
--- a/drivers/gpu/drm/radeon/sumo_dpm.c
+++ b/drivers/gpu/drm/radeon/sumo_dpm.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "sumod.h"
diff --git a/drivers/gpu/drm/radeon/sumo_smc.c b/drivers/gpu/drm/radeon/sumo_smc.c
index fb081d2ae374..cc051be42362 100644
--- a/drivers/gpu/drm/radeon/sumo_smc.c
+++ b/drivers/gpu/drm/radeon/sumo_smc.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "sumod.h"
 #include "sumo_dpm.h"
diff --git a/drivers/gpu/drm/radeon/trinity_dpm.c b/drivers/gpu/drm/radeon/trinity_dpm.c
index 6730367ac228..2ef7c4e5e495 100644
--- a/drivers/gpu/drm/radeon/trinity_dpm.c
+++ b/drivers/gpu/drm/radeon/trinity_dpm.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "trinityd.h"
diff --git a/drivers/gpu/drm/radeon/trinity_smc.c b/drivers/gpu/drm/radeon/trinity_smc.c
index 99dd0455334d..0310e36e3159 100644
--- a/drivers/gpu/drm/radeon/trinity_smc.c
+++ b/drivers/gpu/drm/radeon/trinity_smc.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "trinityd.h"
 #include "trinity_dpm.h"
diff --git a/drivers/gpu/drm/savage/Makefile b/drivers/gpu/drm/savage/Makefile
index d8f84ac7bb26..cfd436bb28e4 100644
--- a/drivers/gpu/drm/savage/Makefile
+++ b/drivers/gpu/drm/savage/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y = -Iinclude/drm
 savage-y := savage_drv.o savage_bci.o savage_state.o
 
 obj-$(CONFIG_DRM_SAVAGE)+= savage.o
diff --git a/drivers/gpu/drm/sis/Makefile b/drivers/gpu/drm/sis/Makefile
index 441c061c3ad0..7bf4c130c8fd 100644
--- a/drivers/gpu/drm/sis/Makefile
+++ b/drivers/gpu/drm/sis/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y = -Iinclude/drm
 sis-y := sis_drv.o sis_mm.o
 
 obj-$(CONFIG_DRM_SIS)   += sis.o
diff --git a/drivers/gpu/drm/sti/sti_compositor.c b/drivers/gpu/drm/sti/sti_compositor.c
index 11d4e885893a..6e4bf68262db 100644
--- a/drivers/gpu/drm/sti/sti_compositor.c
+++ b/drivers/gpu/drm/sti/sti_compositor.c
@@ -129,7 +129,7 @@ static int sti_compositor_bind(struct device *dev,
                         }
                         break;
                 default:
-                        DRM_ERROR("Unknown subdev compoment type\n");
+                        DRM_ERROR("Unknown subdev component type\n");
                         return 1;
                 }
 
diff --git a/drivers/gpu/drm/stm/Makefile b/drivers/gpu/drm/stm/Makefile
index e114d45dbd42..a09ecf450218 100644
--- a/drivers/gpu/drm/stm/Makefile
+++ b/drivers/gpu/drm/stm/Makefile
@@ -1,5 +1,3 @@
-ccflags-y := -Iinclude/drm
-
 stm-drm-y := \
         drv.o \
         ltdc.o
diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
index a40418cda74a..700cc0800e51 100644
--- a/drivers/gpu/drm/stm/ltdc.c
+++ b/drivers/gpu/drm/stm/ltdc.c
@@ -463,7 +463,7 @@ static void ltdc_crtc_mode_set_nofb(struct drm_crtc *crtc)
         clk_enable(ldev->pixel_clk);
 
         /* Configures the HS, VS, DE and PC polarities. */
-        val = HSPOL_AL | HSPOL_AL | DEPOL_AL | PCPOL_IPC;
+        val = HSPOL_AL | VSPOL_AL | DEPOL_AL | PCPOL_IPC;
 
         if (vm.flags & DISPLAY_FLAGS_HSYNC_HIGH)
                 val |= HSPOL_AH;
diff --git a/drivers/gpu/drm/tdfx/Makefile b/drivers/gpu/drm/tdfx/Makefile
index 0379f294b32a..74bd4ae32348 100644
--- a/drivers/gpu/drm/tdfx/Makefile
+++ b/drivers/gpu/drm/tdfx/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y := -Iinclude/drm
 tdfx-y := tdfx_drv.o
 
 obj-$(CONFIG_DRM_TDFX)  += tdfx.o
diff --git a/drivers/gpu/drm/tilcdc/Makefile b/drivers/gpu/drm/tilcdc/Makefile
index 6f675175a9e5..55ebd516728f 100644
--- a/drivers/gpu/drm/tilcdc/Makefile
+++ b/drivers/gpu/drm/tilcdc/Makefile
@@ -1,4 +1,3 @@
-ccflags-y := -Iinclude/drm
 ifeq (, $(findstring -W,$(EXTRA_CFLAGS)))
         ccflags-y += -Werror
 endif
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
index d7ae5be56d12..d67e18983a7d 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
@@ -22,6 +22,7 @@
 #include <linux/suspend.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_fb_helper.h>
 
 #include "tilcdc_drv.h"
 #include "tilcdc_regs.h"
@@ -29,8 +30,6 @@
 #include "tilcdc_panel.h"
 #include "tilcdc_external.h"
 
-#include "drm_fb_helper.h"
-
 static LIST_HEAD(module_list);
 
 static const u32 tilcdc_rev1_formats[] = { DRM_FORMAT_RGB565 };
diff --git a/drivers/gpu/drm/ttm/Makefile b/drivers/gpu/drm/ttm/Makefile
index f92325800f8a..4d0c938ff4b2 100644
--- a/drivers/gpu/drm/ttm/Makefile
+++ b/drivers/gpu/drm/ttm/Makefile
@@ -1,7 +1,6 @@
 #
 # Makefile for the drm device driver.  This driver provides support for the
 
-ccflags-y := -Iinclude/drm
 ttm-y := ttm_memory.o ttm_tt.o ttm_bo.o \
         ttm_bo_util.o ttm_bo_vm.o ttm_module.o \
         ttm_object.o ttm_lock.o ttm_execbuf_util.o ttm_page_alloc.o \
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
index 9f53df95f35c..b442d12f2f7d 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -30,9 +30,9 @@
 
 #define pr_fmt(fmt) "[TTM] " fmt
 
-#include <ttm/ttm_module.h>
-#include <ttm/ttm_bo_driver.h>
-#include <ttm/ttm_placement.h>
+#include <drm/ttm/ttm_module.h>
+#include <drm/ttm/ttm_bo_driver.h>
+#include <drm/ttm/ttm_placement.h>
 #include <drm/drm_vma_manager.h>
 #include <linux/mm.h>
 #include <linux/pfn_t.h>
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index 5260179d788a..8ebc8d3560c3 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -39,7 +39,6 @@
 #include <linux/slab.h>
 #include <linux/export.h>
 #include <drm/drm_cache.h>
-#include <drm/drm_mem_util.h>
 #include <drm/ttm/ttm_module.h>
 #include <drm/ttm/ttm_bo_driver.h>
 #include <drm/ttm/ttm_placement.h>
@@ -53,14 +52,16 @@
  */
 static void ttm_tt_alloc_page_directory(struct ttm_tt *ttm)
 {
-        ttm->pages = drm_calloc_large(ttm->num_pages, sizeof(void*));
+        ttm->pages = kvmalloc_array(ttm->num_pages, sizeof(void*),
+                        GFP_KERNEL | __GFP_ZERO);
 }
 
 static void ttm_dma_tt_alloc_page_directory(struct ttm_dma_tt *ttm)
 {
-        ttm->ttm.pages = drm_calloc_large(ttm->ttm.num_pages,
+        ttm->ttm.pages = kvmalloc_array(ttm->ttm.num_pages,
                                           sizeof(*ttm->ttm.pages) +
-                                          sizeof(*ttm->dma_address));
+                                          sizeof(*ttm->dma_address),
+                                          GFP_KERNEL | __GFP_ZERO);
         ttm->dma_address = (void *) (ttm->ttm.pages + ttm->ttm.num_pages);
 }
 
@@ -208,7 +209,7 @@ EXPORT_SYMBOL(ttm_tt_init);
 
 void ttm_tt_fini(struct ttm_tt *ttm)
 {
-        drm_free_large(ttm->pages);
+        kvfree(ttm->pages);
         ttm->pages = NULL;
 }
 EXPORT_SYMBOL(ttm_tt_fini);
@@ -243,7 +244,7 @@ void ttm_dma_tt_fini(struct ttm_dma_tt *ttm_dma)
 {
         struct ttm_tt *ttm = &ttm_dma->ttm;
 
-        drm_free_large(ttm->pages);
+        kvfree(ttm->pages);
         ttm->pages = NULL;
         ttm_dma->dma_address = NULL;
 }
diff --git a/drivers/gpu/drm/udl/Makefile b/drivers/gpu/drm/udl/Makefile
index 195bcac0b6c8..36f2e825102b 100644
--- a/drivers/gpu/drm/udl/Makefile
+++ b/drivers/gpu/drm/udl/Makefile
@@ -1,6 +1,3 @@
-
-ccflags-y := -Iinclude/drm
-
 udl-y := udl_drv.o udl_modeset.o udl_connector.o udl_encoder.o udl_main.o udl_fb.o udl_transfer.o udl_gem.o udl_dmabuf.o
 
 obj-$(CONFIG_DRM_UDL) := udl.o
diff --git a/drivers/gpu/drm/udl/udl_dmabuf.c b/drivers/gpu/drm/udl/udl_dmabuf.c
index ed0e636243b2..2e031a894813 100644
--- a/drivers/gpu/drm/udl/udl_dmabuf.c
+++ b/drivers/gpu/drm/udl/udl_dmabuf.c
@@ -228,7 +228,7 @@ static int udl_prime_create(struct drm_device *dev,
                 return -ENOMEM;
 
         obj->sg = sg;
-        obj->pages = drm_malloc_ab(npages, sizeof(struct page *));
+        obj->pages = kvmalloc_array(npages, sizeof(struct page *), GFP_KERNEL);
         if (obj->pages == NULL) {
                 DRM_ERROR("obj pages is NULL %d\n", npages);
                 return -ENOMEM;
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c
index 775c50e4f02c..db9ceceba30e 100644
--- a/drivers/gpu/drm/udl/udl_gem.c
+++ b/drivers/gpu/drm/udl/udl_gem.c
@@ -146,7 +146,7 @@ int udl_gem_get_pages(struct udl_gem_object *obj)
 void udl_gem_put_pages(struct udl_gem_object *obj)
 {
         if (obj->base.import_attach) {
-                drm_free_large(obj->pages);
+                kvfree(obj->pages);
                 obj->pages = NULL;
                 return;
         }
diff --git a/drivers/gpu/drm/vc4/Kconfig b/drivers/gpu/drm/vc4/Kconfig
index 973b4203c0b2..b16aefe4a8d3 100644
--- a/drivers/gpu/drm/vc4/Kconfig
+++ b/drivers/gpu/drm/vc4/Kconfig
@@ -1,6 +1,6 @@
 config DRM_VC4
         tristate "Broadcom VC4 Graphics"
-        depends on ARCH_BCM2835 || COMPILE_TEST
+        depends on ARCH_BCM || ARCH_BCM2835 || COMPILE_TEST
         depends on DRM
         depends on SND && SND_SOC
         depends on COMMON_CLK
diff --git a/drivers/gpu/drm/vc4/Makefile b/drivers/gpu/drm/vc4/Makefile
index ab687fba4916..25bd5d30415d 100644
--- a/drivers/gpu/drm/vc4/Makefile
+++ b/drivers/gpu/drm/vc4/Makefile
@@ -1,5 +1,3 @@
-ccflags-y := -Iinclude/drm
-
 # Please keep these build lists sorted!
 
 # core driver code
diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
index 1b4dbe9e1c6d..0bfc4d88e4c2 100644
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
@@ -32,13 +32,13 @@
  * ones that set the clock.
  */
 
-#include "drm_atomic.h"
-#include "drm_atomic_helper.h"
-#include "drm_crtc_helper.h"
-#include "linux/clk.h"
-#include "drm_fb_cma_helper.h"
-#include "linux/component.h"
-#include "linux/of_device.h"
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc_helper.h>
+#include <linux/clk.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <linux/component.h>
+#include <linux/of_device.h>
 #include "vc4_drv.h"
 #include "vc4_regs.h"
 
diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c
index c6d703903fd9..39d68080873c 100644
--- a/drivers/gpu/drm/vc4/vc4_dpi.c
+++ b/drivers/gpu/drm/vc4/vc4_dpi.c
@@ -22,14 +22,14 @@
  * ALT2 function.
  */
 
-#include "drm_atomic_helper.h"
-#include "drm_crtc_helper.h"
-#include "drm_edid.h"
-#include "drm_panel.h"
-#include "linux/clk.h"
-#include "linux/component.h"
-#include "linux/of_graph.h"
-#include "linux/of_platform.h"
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_edid.h>
+#include <drm/drm_panel.h>
+#include <linux/clk.h>
+#include <linux/component.h>
+#include <linux/of_graph.h>
+#include <linux/of_platform.h>
 #include "vc4_drv.h"
 #include "vc4_regs.h"
 
diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
index 863974942c66..136bb4213dc0 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -31,7 +31,7 @@
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
-#include "drm_fb_cma_helper.h"
+#include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_fb_helper.h>
 
 #include "uapi/drm/vc4_drm.h"
diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
index 5ba281361fb7..a97556f7ccba 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.h
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
@@ -6,12 +6,10 @@
  * published by the Free Software Foundation.
  */
 
-#include "drmP.h"
-#include "drm_gem_cma_helper.h"
-#include "drm_gem_cma_helper.h"
-
 #include <linux/reservation.h>
+#include <drm/drmP.h>
 #include <drm/drm_encoder.h>
+#include <drm/drm_gem_cma_helper.h>
 
 struct vc4_dev {
         struct drm_device *dev;
diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c
index 160f981d1cf4..0ef41df3915f 100644
--- a/drivers/gpu/drm/vc4/vc4_dsi.c
+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
@@ -29,20 +29,20 @@
  * hopefully present.
  */
 
-#include "drm_atomic_helper.h"
-#include "drm_crtc_helper.h"
-#include "drm_edid.h"
-#include "drm_mipi_dsi.h"
-#include "drm_panel.h"
-#include "linux/clk.h"
-#include "linux/clk-provider.h"
-#include "linux/completion.h"
-#include "linux/component.h"
-#include "linux/dmaengine.h"
-#include "linux/i2c.h"
-#include "linux/of_address.h"
-#include "linux/of_platform.h"
-#include "linux/pm_runtime.h"
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_edid.h>
+#include <drm/drm_mipi_dsi.h>
+#include <drm/drm_panel.h>
+#include <linux/clk.h>
+#include <linux/clk-provider.h>
+#include <linux/completion.h>
+#include <linux/component.h>
+#include <linux/dmaengine.h>
+#include <linux/i2c.h>
+#include <linux/of_address.h>
+#include <linux/of_platform.h>
+#include <linux/pm_runtime.h>
 #include "vc4_drv.h"
 #include "vc4_regs.h"
 
@@ -519,7 +519,8 @@ struct vc4_dsi {
         /* DSI channel for the panel we're connected to. */
         u32 channel;
         u32 lanes;
-        enum mipi_dsi_pixel_format format;
+        u32 format;
+        u32 divider;
         u32 mode_flags;
 
         /* Input clock from CPRMAN to the digital PHY, for the DSI
@@ -906,13 +907,67 @@ static void vc4_dsi_encoder_disable(struct drm_encoder *encoder)
         pm_runtime_put(dev);
 }
 
+/* Extends the mode's blank intervals to handle BCM2835's integer-only
+ * DSI PLL divider.
+ *
+ * On 2835, PLLD is set to 2Ghz, and may not be changed by the display
+ * driver since most peripherals are hanging off of the PLLD_PER
+ * divider.  PLLD_DSI1, which drives our DSI bit clock (and therefore
+ * the pixel clock), only has an integer divider off of DSI.
+ *
+ * To get our panel mode to refresh at the expected 60Hz, we need to
+ * extend the horizontal blank time.  This means we drive a
+ * higher-than-expected clock rate to the panel, but that's what the
+ * firmware does too.
+ */
+static bool vc4_dsi_encoder_mode_fixup(struct drm_encoder *encoder,
+                                       const struct drm_display_mode *mode,
+                                       struct drm_display_mode *adjusted_mode)
+{
+        struct vc4_dsi_encoder *vc4_encoder = to_vc4_dsi_encoder(encoder);
+        struct vc4_dsi *dsi = vc4_encoder->dsi;
+        struct clk *phy_parent = clk_get_parent(dsi->pll_phy_clock);
+        unsigned long parent_rate = clk_get_rate(phy_parent);
+        unsigned long pixel_clock_hz = mode->clock * 1000;
+        unsigned long pll_clock = pixel_clock_hz * dsi->divider;
+        int divider;
+
+        /* Find what divider gets us a faster clock than the requested
+         * pixel clock.
+         */
+        for (divider = 1; divider < 8; divider++) {
+                if (parent_rate / divider < pll_clock) {
+                        divider--;
+                        break;
+                }
+        }
+
+        /* Now that we've picked a PLL divider, calculate back to its
+         * pixel clock.
+         */
+        pll_clock = parent_rate / divider;
+        pixel_clock_hz = pll_clock / dsi->divider;
+
+        /* Round up the clk_set_rate() request slightly, since
+         * PLLD_DSI1 is an integer divider and its rate selection will
+         * never round up.
+         */
+        adjusted_mode->clock = pixel_clock_hz / 1000 + 1;
+
+        /* Given the new pixel clock, adjust HFP to keep vrefresh the same. */
+        adjusted_mode->htotal = pixel_clock_hz / (mode->vrefresh * mode->vtotal);
+        adjusted_mode->hsync_end += adjusted_mode->htotal - mode->htotal;
+        adjusted_mode->hsync_start += adjusted_mode->htotal - mode->htotal;
+
+        return true;
+}
+
 static void vc4_dsi_encoder_enable(struct drm_encoder *encoder)
 {
-        struct drm_display_mode *mode = &encoder->crtc->mode;
+        struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
         struct vc4_dsi_encoder *vc4_encoder = to_vc4_dsi_encoder(encoder);
         struct vc4_dsi *dsi = vc4_encoder->dsi;
         struct device *dev = &dsi->pdev->dev;
-        u32 format = 0, divider = 0;
         bool debug_dump_regs = false;
         unsigned long hs_clock;
         u32 ui_ns;
@@ -940,26 +995,7 @@ static void vc4_dsi_encoder_enable(struct drm_encoder *encoder)
                 vc4_dsi_dump_regs(dsi);
         }
 
-        switch (dsi->format) {
-        case MIPI_DSI_FMT_RGB888:
-                format = DSI_PFORMAT_RGB888;
-                divider = 24 / dsi->lanes;
-                break;
-        case MIPI_DSI_FMT_RGB666:
-                format = DSI_PFORMAT_RGB666;
-                divider = 24 / dsi->lanes;
-                break;
-        case MIPI_DSI_FMT_RGB666_PACKED:
-                format = DSI_PFORMAT_RGB666_PACKED;
-                divider = 18 / dsi->lanes;
-                break;
-        case MIPI_DSI_FMT_RGB565:
-                format = DSI_PFORMAT_RGB565;
-                divider = 16 / dsi->lanes;
-                break;
-        }
-
-        phy_clock = pixel_clock_hz * divider;
+        phy_clock = pixel_clock_hz * dsi->divider;
         ret = clk_set_rate(dsi->pll_phy_clock, phy_clock);
         if (ret) {
                 dev_err(&dsi->pdev->dev,
@@ -1134,8 +1170,9 @@ static void vc4_dsi_encoder_enable(struct drm_encoder *encoder)
 
         if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO) {
                 DSI_PORT_WRITE(DISP0_CTRL,
-                               VC4_SET_FIELD(divider, DSI_DISP0_PIX_CLK_DIV) |
-                               VC4_SET_FIELD(format, DSI_DISP0_PFORMAT) |
+                               VC4_SET_FIELD(dsi->divider,
+                                             DSI_DISP0_PIX_CLK_DIV) |
+                               VC4_SET_FIELD(dsi->format, DSI_DISP0_PFORMAT) |
                                VC4_SET_FIELD(DSI_DISP0_LP_STOP_PERFRAME,
                                              DSI_DISP0_LP_STOP_CTRL) |
                                DSI_DISP0_ST_END |
@@ -1347,9 +1384,31 @@ static int vc4_dsi_host_attach(struct mipi_dsi_host *host,
 
         dsi->lanes = device->lanes;
         dsi->channel = device->channel;
-        dsi->format = device->format;
         dsi->mode_flags = device->mode_flags;
 
+        switch (device->format) {
+        case MIPI_DSI_FMT_RGB888:
+                dsi->format = DSI_PFORMAT_RGB888;
+                dsi->divider = 24 / dsi->lanes;
+                break;
+        case MIPI_DSI_FMT_RGB666:
+                dsi->format = DSI_PFORMAT_RGB666;
+                dsi->divider = 24 / dsi->lanes;
+                break;
+        case MIPI_DSI_FMT_RGB666_PACKED:
+                dsi->format = DSI_PFORMAT_RGB666_PACKED;
+                dsi->divider = 18 / dsi->lanes;
+                break;
+        case MIPI_DSI_FMT_RGB565:
+                dsi->format = DSI_PFORMAT_RGB565;
+                dsi->divider = 16 / dsi->lanes;
+                break;
+        default:
+                dev_err(&dsi->pdev->dev, "Unknown DSI format: %d.\n",
+                        dsi->format);
+                return 0;
+        }
+
         if (!(dsi->mode_flags & MIPI_DSI_MODE_VIDEO)) {
                 dev_err(&dsi->pdev->dev,
                         "Only VIDEO mode panels supported currently.\n");
@@ -1397,6 +1456,7 @@ static const struct mipi_dsi_host_ops vc4_dsi_host_ops = {
 static const struct drm_encoder_helper_funcs vc4_dsi_encoder_helper_funcs = {
         .disable = vc4_dsi_encoder_disable,
         .enable = vc4_dsi_encoder_enable,
+        .mode_fixup = vc4_dsi_encoder_mode_fixup,
 };
 
 static const struct of_device_id vc4_dsi_dt_match[] = {
diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c
index 735412e3725a..9dc7646d49ed 100644
--- a/drivers/gpu/drm/vc4/vc4_gem.c
+++ b/drivers/gpu/drm/vc4/vc4_gem.c
@@ -660,14 +660,15 @@ vc4_cl_lookup_bos(struct drm_device *dev,
                 return -EINVAL;
         }
 
-        exec->bo = drm_calloc_large(exec->bo_count,
-                                    sizeof(struct drm_gem_cma_object *));
+        exec->bo = kvmalloc_array(exec->bo_count,
+                                    sizeof(struct drm_gem_cma_object *),
+                                    GFP_KERNEL | __GFP_ZERO);
         if (!exec->bo) {
                 DRM_ERROR("Failed to allocate validated BO pointers\n");
                 return -ENOMEM;
         }
 
-        handles = drm_malloc_ab(exec->bo_count, sizeof(uint32_t));
+        handles = kvmalloc_array(exec->bo_count, sizeof(uint32_t), GFP_KERNEL);
         if (!handles) {
                 ret = -ENOMEM;
                 DRM_ERROR("Failed to allocate incoming GEM handles\n");
@@ -699,7 +700,7 @@ vc4_cl_lookup_bos(struct drm_device *dev,
         spin_unlock(&file_priv->table_lock);
 
 fail:
-        drm_free_large(handles);
+        kvfree(handles);
         return ret;
 }
 
@@ -737,7 +738,7 @@ vc4_get_bcl(struct drm_device *dev, struct vc4_exec_info *exec)
          * read the contents back for validation, and I think the
          * bo->vaddr is uncached access.
          */
-        temp = drm_malloc_ab(temp_size, 1);
+        temp = kvmalloc_array(temp_size, 1, GFP_KERNEL);
         if (!temp) {
                 DRM_ERROR("Failed to allocate storage for copying "
                           "in bin/render CLs.\n");
@@ -812,7 +813,7 @@ vc4_get_bcl(struct drm_device *dev, struct vc4_exec_info *exec)
         ret = vc4_wait_for_seqno(dev, exec->bin_dep_seqno, ~0ull, true);
 
 fail:
-        drm_free_large(temp);
+        kvfree(temp);
         return ret;
 }
 
@@ -832,7 +833,7 @@ vc4_complete_exec(struct drm_device *dev, struct vc4_exec_info *exec)
         if (exec->bo) {
                 for (i = 0; i < exec->bo_count; i++)
                         drm_gem_object_unreference_unlocked(&exec->bo[i]->base);
-                drm_free_large(exec->bo);
+                kvfree(exec->bo);
         }
 
         while (!list_empty(&exec->unref_list)) {
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 3c2723f6345c..ed63d4e85762 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -42,21 +42,21 @@
  * encoder block has CEC support.
  */
 
-#include "drm_atomic_helper.h"
-#include "drm_crtc_helper.h"
-#include "drm_edid.h"
-#include "linux/clk.h"
-#include "linux/component.h"
-#include "linux/i2c.h"
-#include "linux/of_address.h"
-#include "linux/of_gpio.h"
-#include "linux/of_platform.h"
-#include "linux/pm_runtime.h"
-#include "linux/rational.h"
-#include "sound/dmaengine_pcm.h"
-#include "sound/pcm_drm_eld.h"
-#include "sound/pcm_params.h"
-#include "sound/soc.h"
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_edid.h>
+#include <linux/clk.h>
+#include <linux/component.h>
+#include <linux/i2c.h>
+#include <linux/of_address.h>
+#include <linux/of_gpio.h>
+#include <linux/of_platform.h>
+#include <linux/pm_runtime.h>
+#include <linux/rational.h>
+#include <sound/dmaengine_pcm.h>
+#include <sound/pcm_drm_eld.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
 #include "vc4_drv.h"
 #include "vc4_regs.h"
 
diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c
index fd421ba3c5d7..2b62fc5b8d85 100644
--- a/drivers/gpu/drm/vc4/vc4_hvs.c
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
@@ -22,7 +22,7 @@
  * each CRTC.
  */
 
-#include "linux/component.h"
+#include <linux/component.h>
 #include "vc4_drv.h"
 #include "vc4_regs.h"
 
diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
index 237a504f11f0..928d191ef90f 100644
--- a/drivers/gpu/drm/vc4/vc4_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
@@ -14,12 +14,12 @@
  * crtc, HDMI encoder).
  */
 
-#include "drm_crtc.h"
-#include "drm_atomic.h"
-#include "drm_atomic_helper.h"
-#include "drm_crtc_helper.h"
-#include "drm_plane_helper.h"
-#include "drm_fb_cma_helper.h"
+#include <drm/drm_crtc.h>
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_plane_helper.h>
+#include <drm/drm_fb_cma_helper.h>
 #include "vc4_drv.h"
 
 static void vc4_output_poll_changed(struct drm_device *dev)
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
index d34cd5393a9b..da18dec21696 100644
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -18,12 +18,13 @@
  * into the region of the HVS that it has allocated for us.
  */
 
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_plane_helper.h>
+
 #include "vc4_drv.h"
 #include "vc4_regs.h"
-#include "drm_atomic.h"
-#include "drm_atomic_helper.h"
-#include "drm_fb_cma_helper.h"
-#include "drm_plane_helper.h"
 
 enum vc4_scaling_mode {
         VC4_SCALING_NONE,
diff --git a/drivers/gpu/drm/vc4/vc4_v3d.c b/drivers/gpu/drm/vc4/vc4_v3d.c
index c53afec34586..5ae5518e605b 100644
--- a/drivers/gpu/drm/vc4/vc4_v3d.c
+++ b/drivers/gpu/drm/vc4/vc4_v3d.c
@@ -16,9 +16,9 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "linux/clk.h"
-#include "linux/component.h"
-#include "linux/pm_runtime.h"
+#include <linux/clk.h>
+#include <linux/component.h>
+#include <linux/pm_runtime.h>
 #include "vc4_drv.h"
 #include "vc4_regs.h"
 
diff --git a/drivers/gpu/drm/vc4/vc4_validate.c b/drivers/gpu/drm/vc4/vc4_validate.c
index 3de8f11595c0..814b512c6b9a 100644
--- a/drivers/gpu/drm/vc4/vc4_validate.c
+++ b/drivers/gpu/drm/vc4/vc4_validate.c
@@ -172,7 +172,8 @@ vc4_check_tex_size(struct vc4_exec_info *exec, struct drm_gem_cma_object *fbo,
          * our math.
          */
         if (width > 4096 || height > 4096) {
-                DRM_ERROR("Surface dimesions (%d,%d) too large", width, height);
+                DRM_ERROR("Surface dimensions (%d,%d) too large",
+                          width, height);
                 return false;
         }
 
diff --git a/drivers/gpu/drm/vgem/Makefile b/drivers/gpu/drm/vgem/Makefile
index bfcdea1330e6..cb5d413b9c93 100644
--- a/drivers/gpu/drm/vgem/Makefile
+++ b/drivers/gpu/drm/vgem/Makefile
@@ -1,4 +1,3 @@
-ccflags-y := -Iinclude/drm
 vgem-y := vgem_drv.o vgem_fence.o
 
 obj-$(CONFIG_DRM_VGEM)  += vgem.o
diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c
index 4b23ba049632..18f401b442c2 100644
--- a/drivers/gpu/drm/vgem/vgem_drv.c
+++ b/drivers/gpu/drm/vgem/vgem_drv.c
@@ -51,7 +51,7 @@ static void vgem_gem_free_object(struct drm_gem_object *obj)
 {
         struct drm_vgem_gem_object *vgem_obj = to_vgem_bo(obj);
 
-        drm_free_large(vgem_obj->pages);
+        kvfree(vgem_obj->pages);
 
         if (obj->import_attach)
                 drm_prime_gem_destroy(obj, vgem_obj->table);
@@ -328,7 +328,7 @@ static struct drm_gem_object *vgem_prime_import_sg_table(struct drm_device *dev,
         npages = PAGE_ALIGN(attach->dmabuf->size) / PAGE_SIZE;
 
         obj->table = sg;
-        obj->pages = drm_malloc_ab(npages, sizeof(struct page *));
+        obj->pages = kvmalloc_array(npages, sizeof(struct page *), GFP_KERNEL);
         if (!obj->pages) {
                 __vgem_gem_destroy(obj);
                 return ERR_PTR(-ENOMEM);
@@ -438,8 +438,8 @@ static int __init vgem_init(void)
 
         vgem_device->platform =
                 platform_device_register_simple("vgem", -1, NULL, 0);
-        if (!vgem_device->platform) {
-                ret = -ENODEV;
+        if (IS_ERR(vgem_device->platform)) {
+                ret = PTR_ERR(vgem_device->platform);
                 goto out_fini;
         }
 
diff --git a/drivers/gpu/drm/via/Makefile b/drivers/gpu/drm/via/Makefile
index d59e258e2c13..751fa8b8a014 100644
--- a/drivers/gpu/drm/via/Makefile
+++ b/drivers/gpu/drm/via/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y := -Iinclude/drm
 via-y    := via_irq.o via_drv.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o via_dmablit.o
 
 obj-$(CONFIG_DRM_VIA)   +=via.o
diff --git a/drivers/gpu/drm/virtio/Makefile b/drivers/gpu/drm/virtio/Makefile
index 3fb8eac1084f..7684f613bdc3 100644
--- a/drivers/gpu/drm/virtio/Makefile
+++ b/drivers/gpu/drm/virtio/Makefile
@@ -2,8 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y := -Iinclude/drm
-
 virtio-gpu-y := virtgpu_drv.o virtgpu_kms.o virtgpu_drm_bus.o virtgpu_gem.o \
         virtgpu_fb.o virtgpu_display.o virtgpu_vq.o virtgpu_ttm.o \
         virtgpu_fence.o virtgpu_object.o virtgpu_debugfs.o virtgpu_plane.o \
diff --git a/drivers/gpu/drm/virtio/virtgpu_debugfs.c b/drivers/gpu/drm/virtio/virtgpu_debugfs.c
index f51240aa720d..73dc99046c43 100644
--- a/drivers/gpu/drm/virtio/virtgpu_debugfs.c
+++ b/drivers/gpu/drm/virtio/virtgpu_debugfs.c
@@ -24,8 +24,8 @@
  */
 
 #include <linux/debugfs.h>
+#include <drm/drmP.h>
 
-#include "drmP.h"
 #include "virtgpu_drv.h"
 
 static int
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c
index 2d29b0141545..63d35c7e416c 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.c
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.c
@@ -29,8 +29,8 @@
 #include <linux/module.h>
 #include <linux/console.h>
 #include <linux/pci.h>
-#include "drmP.h"
-#include "drm/drm.h"
+#include <drm/drmP.h>
+#include <drm/drm.h>
 
 #include "virtgpu_drv.h"
 static struct drm_driver driver;
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
index 1328185bfd59..3a66abb8fd50 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.h
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
@@ -36,10 +36,10 @@
 #include <drm/drm_atomic.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_encoder.h>
-#include <ttm/ttm_bo_api.h>
-#include <ttm/ttm_bo_driver.h>
-#include <ttm/ttm_placement.h>
-#include <ttm/ttm_module.h>
+#include <drm/ttm/ttm_bo_api.h>
+#include <drm/ttm/ttm_bo_driver.h>
+#include <drm/ttm/ttm_placement.h>
+#include <drm/ttm/ttm_module.h>
 
 #define DRIVER_NAME "virtio_gpu"
 #define DRIVER_DESC "virtio GPU"
diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index 61f3a963af95..b94bd5440e57 100644
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -26,9 +26,10 @@
  */
 
 #include <drm/drmP.h>
-#include "virtgpu_drv.h"
 #include <drm/virtgpu_drm.h>
-#include "ttm/ttm_execbuf_util.h"
+#include <drm/ttm/ttm_execbuf_util.h>
+
+#include "virtgpu_drv.h"
 
 static void convert_to_hw_box(struct virtio_gpu_box *dst,
                               const struct drm_virtgpu_3d_box *src)
@@ -119,13 +120,14 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
         INIT_LIST_HEAD(&validate_list);
         if (exbuf->num_bo_handles) {
 
-                bo_handles = drm_malloc_ab(exbuf->num_bo_handles,
-                                           sizeof(uint32_t));
-                buflist = drm_calloc_large(exbuf->num_bo_handles,
-                                           sizeof(struct ttm_validate_buffer));
+                bo_handles = kvmalloc_array(exbuf->num_bo_handles,
+                                           sizeof(uint32_t), GFP_KERNEL);
+                buflist = kvmalloc_array(exbuf->num_bo_handles,
+                                           sizeof(struct ttm_validate_buffer),
+                                           GFP_KERNEL | __GFP_ZERO);
                 if (!bo_handles || !buflist) {
-                        drm_free_large(bo_handles);
-                        drm_free_large(buflist);
+                        kvfree(bo_handles);
+                        kvfree(buflist);
                         return -ENOMEM;
                 }
 
@@ -133,16 +135,16 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
                 if (copy_from_user(bo_handles, user_bo_handles,
                                    exbuf->num_bo_handles * sizeof(uint32_t))) {
                         ret = -EFAULT;
-                        drm_free_large(bo_handles);
-                        drm_free_large(buflist);
+                        kvfree(bo_handles);
+                        kvfree(buflist);
                         return ret;
                 }
 
                 for (i = 0; i < exbuf->num_bo_handles; i++) {
                         gobj = drm_gem_object_lookup(drm_file, bo_handles[i]);
                         if (!gobj) {
-                                drm_free_large(bo_handles);
-                                drm_free_large(buflist);
+                                kvfree(bo_handles);
+                                kvfree(buflist);
                                 return -ENOENT;
                         }
 
@@ -151,7 +153,7 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
 
                         list_add(&buflist[i].head, &validate_list);
                 }
-                drm_free_large(bo_handles);
+                kvfree(bo_handles);
         }
 
         ret = virtio_gpu_object_list_validate(&ticket, &validate_list);
@@ -171,7 +173,7 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
 
         /* fence the command bo */
         virtio_gpu_unref_list(&validate_list);
-        drm_free_large(buflist);
+        kvfree(buflist);
         dma_fence_put(&fence->f);
         return 0;
 
@@ -179,7 +181,7 @@ out_unresv:
         ttm_eu_backoff_reservation(&ticket, &validate_list);
 out_free:
         virtio_gpu_unref_list(&validate_list);
-        drm_free_large(buflist);
+        kvfree(buflist);
         return ret;
 }
 
diff --git a/drivers/gpu/drm/virtio/virtgpu_ttm.c b/drivers/gpu/drm/virtio/virtgpu_ttm.c
index 4e8e27d50922..c1f2af4ca4ca 100644
--- a/drivers/gpu/drm/virtio/virtgpu_ttm.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ttm.c
@@ -25,11 +25,11 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <ttm/ttm_bo_api.h>
-#include <ttm/ttm_bo_driver.h>
-#include <ttm/ttm_placement.h>
-#include <ttm/ttm_page_alloc.h>
-#include <ttm/ttm_module.h>
+#include <drm/ttm/ttm_bo_api.h>
+#include <drm/ttm/ttm_bo_driver.h>
+#include <drm/ttm/ttm_placement.h>
+#include <drm/ttm/ttm_page_alloc.h>
+#include <drm/ttm/ttm_module.h>
 #include <drm/drmP.h>
 #include <drm/drm.h>
 #include <drm/virtgpu_drm.h>
diff --git a/drivers/gpu/drm/vmwgfx/Makefile b/drivers/gpu/drm/vmwgfx/Makefile
index aac17a640cce..a365330bbb82 100644
--- a/drivers/gpu/drm/vmwgfx/Makefile
+++ b/drivers/gpu/drm/vmwgfx/Makefile
@@ -1,6 +1,3 @@
-
-ccflags-y := -Iinclude/drm
-
 vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \
             vmwgfx_fb.o vmwgfx_ioctl.o vmwgfx_resource.o vmwgfx_buffer.o \
             vmwgfx_fifo.o vmwgfx_irq.o vmwgfx_ldu.o vmwgfx_ttm_glue.o \
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
index 77cb7c627e09..99a7f4ab7d97 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
@@ -25,8 +25,9 @@
  *
  **************************************************************************/
 
+#include <drm/ttm/ttm_bo_api.h>
+
 #include "vmwgfx_drv.h"
-#include "ttm/ttm_bo_api.h"
 
 /*
  * Size of inline command buffers. Try to make sure that a page size is a
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
index 443d1ed00de7..bcc6d4136c87 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
@@ -25,10 +25,11 @@
  *
  **************************************************************************/
 
+#include <drm/ttm/ttm_placement.h>
+
 #include "vmwgfx_drv.h"
 #include "vmwgfx_resource_priv.h"
 #include "vmwgfx_binding.h"
-#include "ttm/ttm_placement.h"
 
 struct vmw_user_context {
         struct ttm_base_object base;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c
index 265c81e6cf39..6c026d75c180 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c
@@ -30,9 +30,10 @@
  * whenever the backing MOB is evicted.
  */
 
+#include <drm/ttm/ttm_placement.h>
+
 #include "vmwgfx_drv.h"
 #include "vmwgfx_resource_priv.h"
-#include <ttm/ttm_placement.h>
 #include "vmwgfx_so.h"
 
 /**
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index ef9f3a2a4030..a8876b070168 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -566,7 +566,7 @@ int vmw_du_primary_plane_atomic_check(struct drm_plane *plane,
 
         ret = drm_plane_helper_check_update(plane, state->crtc, new_fb,
                                             &src, &dest, &clip,
-                                            DRM_ROTATE_0,
+                                            DRM_MODE_ROTATE_0,
                                             DRM_PLANE_HELPER_NO_SCALING,
                                             DRM_PLANE_HELPER_NO_SCALING,
                                             false, true, &visible);
@@ -845,7 +845,7 @@ void vmw_du_plane_reset(struct drm_plane *plane)
 
         plane->state = &vps->base;
         plane->state->plane = plane;
-        plane->state->rotation = DRM_ROTATE_0;
+        plane->state->rotation = DRM_MODE_ROTATE_0;
 }
 
 
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
index e57a0bad7a62..6063c9636d4a 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
@@ -30,7 +30,7 @@
 #include <linux/kernel.h>
 #include <linux/frame.h>
 #include <asm/hypervisor.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "vmwgfx_msg.h"
 
 
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c b/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c
index 92f8b1d04f0f..68f135c5b0d8 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c
@@ -25,10 +25,11 @@
  *
  **************************************************************************/
 
+#include <drm/ttm/ttm_placement.h>
+
 #include "vmwgfx_drv.h"
 #include "vmwgfx_resource_priv.h"
 #include "vmwgfx_binding.h"
-#include "ttm/ttm_placement.h"
 
 struct vmw_shader {
         struct vmw_resource res;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
index 7681341fe32b..5900cff5bbc3 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
@@ -25,11 +25,12 @@
  *
  **************************************************************************/
 
+#include <drm/ttm/ttm_placement.h>
+
 #include "vmwgfx_drv.h"
 #include "vmwgfx_resource_priv.h"
 #include "vmwgfx_so.h"
 #include "vmwgfx_binding.h"
-#include <ttm/ttm_placement.h>
 #include "device_include/svga3d_surfacedefs.h"
 
 
diff --git a/drivers/gpu/host1x/Kconfig b/drivers/gpu/host1x/Kconfig
index b2fd029d67b3..91916326957f 100644
--- a/drivers/gpu/host1x/Kconfig
+++ b/drivers/gpu/host1x/Kconfig
@@ -1,6 +1,7 @@
 config TEGRA_HOST1X
         tristate "NVIDIA Tegra host1x driver"
         depends on ARCH_TEGRA || (ARM && COMPILE_TEST)
+        select IOMMU_IOVA if IOMMU_SUPPORT
         help
           Driver for the NVIDIA Tegra host1x hardware.
 
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 52085832f711..b9b5566acfe6 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -70,7 +70,6 @@
 #include <drm/drm_fourcc.h>
 #include <drm/drm_global.h>
 #include <drm/drm_hashtab.h>
-#include <drm/drm_mem_util.h>
 #include <drm/drm_mm.h>
 #include <drm/drm_os_linux.h>
 #include <drm/drm_sarea.h>
diff --git a/include/drm/drm_blend.h b/include/drm/drm_blend.h
index bc9e596be4c2..17606026590b 100644
--- a/include/drm/drm_blend.h
+++ b/include/drm/drm_blend.h
@@ -25,32 +25,15 @@
 
 #include <linux/list.h>
 #include <linux/ctype.h>
+#include <drm/drm_mode.h>
 
 struct drm_device;
 struct drm_atomic_state;
 struct drm_plane;
 
-/*
- * Rotation property bits. DRM_ROTATE_<degrees> rotates the image by the
- * specified amount in degrees in counter clockwise direction. DRM_REFLECT_X and
- * DRM_REFLECT_Y reflects the image along the specified axis prior to rotation
- *
- * WARNING: These defines are UABI since they're exposed in the rotation
- * property.
- */
-#define DRM_ROTATE_0    BIT(0)
-#define DRM_ROTATE_90   BIT(1)
-#define DRM_ROTATE_180  BIT(2)
-#define DRM_ROTATE_270  BIT(3)
-#define DRM_ROTATE_MASK (DRM_ROTATE_0   | DRM_ROTATE_90 | \
-                         DRM_ROTATE_180 | DRM_ROTATE_270)
-#define DRM_REFLECT_X   BIT(4)
-#define DRM_REFLECT_Y   BIT(5)
-#define DRM_REFLECT_MASK (DRM_REFLECT_X | DRM_REFLECT_Y)
-
 static inline bool drm_rotation_90_or_270(unsigned int rotation)
 {
-        return rotation & (DRM_ROTATE_90 | DRM_ROTATE_270);
+        return rotation & (DRM_MODE_ROTATE_90 | DRM_MODE_ROTATE_270);
 }
 
 int drm_plane_create_rotation_property(struct drm_plane *plane,
diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h
index fdd82fcbf168..983054f2e86e 100644
--- a/include/drm/drm_bridge.h
+++ b/include/drm/drm_bridge.h
@@ -59,6 +59,40 @@ struct drm_bridge_funcs {
         void (*detach)(struct drm_bridge *bridge);
 
         /**
+         * @mode_valid:
+         *
+         * This callback is used to check if a specific mode is valid in this
+         * bridge. This should be implemented if the bridge has some sort of
+         * restriction in the modes it can display. For example, a given bridge
+         * may be responsible to set a clock value. If the clock can not
+         * produce all the values for the available modes then this callback
+         * can be used to restrict the number of modes to only the ones that
+         * can be displayed.
+         *
+         * This hook is used by the probe helpers to filter the mode list in
+         * drm_helper_probe_single_connector_modes(), and it is used by the
+         * atomic helpers to validate modes supplied by userspace in
+         * drm_atomic_helper_check_modeset().
+         *
+         * This function is optional.
+         *
+         * NOTE:
+         *
+         * Since this function is both called from the check phase of an atomic
+         * commit, and the mode validation in the probe paths it is not allowed
+         * to look at anything else but the passed-in mode, and validate it
+         * against configuration-invariant hardward constraints. Any further
+         * limits which depend upon the configuration can only be checked in
+         * @mode_fixup.
+         *
+         * RETURNS:
+         *
+         * drm_mode_status Enum
+         */
+        enum drm_mode_status (*mode_valid)(struct drm_bridge *crtc,
+                                           const struct drm_display_mode *mode);
+
+        /**
          * @mode_fixup:
          *
          * This callback is used to validate and adjust a mode. The paramater
@@ -66,7 +100,7 @@ struct drm_bridge_funcs {
          * the display chain, either the final &drm_connector or the next
          * &drm_bridge. The parameter adjusted_mode is the input mode the bridge
          * requires. It can be modified by this callback and does not need to
-         * match mode.
+         * match mode. See also &drm_crtc_state.adjusted_mode for more details.
          *
          * This is the only hook that allows a bridge to reject a modeset. If
          * this function passes all other callbacks must succeed for this
@@ -82,6 +116,12 @@ struct drm_bridge_funcs {
          * NOT touch any persistent state (hardware or software) or data
          * structures except the passed in @state parameter.
          *
+         * Also beware that userspace can request its own custom modes, neither
+         * core nor helpers filter modes to the list of probe modes reported by
+         * the GETCONNECTOR IOCTL and stored in &drm_connector.modes. To ensure
+         * that modes are filtered consistently put any bridge constraints and
+         * limits checks into @mode_valid.
+         *
          * RETURNS:
          *
          * True if an acceptable configuration is possible, false if the modeset
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index 9c15993b9071..2fe09c1ddfb8 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -1052,7 +1052,7 @@ void drm_connector_list_iter_end(struct drm_connector_list_iter *iter);
  *
  * Note that @connector is only valid within the list body, if you want to use
  * @connector after calling drm_connector_list_iter_end() then you need to grab
- * your own reference first using drm_connector_begin().
+ * your own reference first using drm_connector_get().
  */
 #define drm_for_each_connector_iter(connector, iter) \
         while ((connector = drm_connector_list_iter_next(iter)))
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index adf4e91a9399..b6e3713bd7a9 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -90,8 +90,6 @@ struct drm_plane_helper_funcs;
  * @plane_mask: bitmask of (1 << drm_plane_index(plane)) of attached planes
  * @connector_mask: bitmask of (1 << drm_connector_index(connector)) of attached connectors
  * @encoder_mask: bitmask of (1 << drm_encoder_index(encoder)) of attached encoders
- * @adjusted_mode: for use by helpers and drivers to compute adjusted mode timings
- * @mode: current mode timings
  * @mode_blob: &drm_property_blob for @mode
  * @state: backpointer to global drm_atomic_state
  *
@@ -131,9 +129,33 @@ struct drm_crtc_state {
         u32 connector_mask;
         u32 encoder_mask;
 
-        /* adjusted_mode: for use by helpers and drivers */
+        /**
+         * @adjusted_mode:
+         *
+         * Internal display timings which can be used by the driver to handle
+         * differences between the mode requested by userspace in @mode and what
+         * is actually programmed into the hardware. It is purely driver
+         * implementation defined what exactly this adjusted mode means. Usually
+         * it is used to store the hardware display timings used between the
+         * CRTC and encoder blocks.
+         */
         struct drm_display_mode adjusted_mode;
 
+        /**
+         * @mode:
+         *
+         * Display timings requested by userspace. The driver should try to
+         * match the refresh rate as close as possible (but note that it's
+         * undefined what exactly is close enough, e.g. some of the HDMI modes
+         * only differ in less than 1% of the refresh rate). The active width
+         * and height as observed by userspace for positioning planes must match
+         * exactly.
+         *
+         * For external connectors where the sink isn't fixed (like with a
+         * built-in panel), this mode here should match the physical mode on the
+         * wire to the last details (i.e. including sync polarities and
+         * everything).
+         */
         struct drm_display_mode mode;
 
         /* blob property to expose current mode to atomic userspace */
diff --git a/include/drm/drm_mem_util.h b/include/drm/drm_mem_util.h
deleted file mode 100644
index d0f6cf2e5324..000000000000
--- a/include/drm/drm_mem_util.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright © 2008 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- *     Jesse Barnes <jbarnes@virtuousgeek.org>
- *
- */
-#ifndef _DRM_MEM_UTIL_H_
-#define _DRM_MEM_UTIL_H_
-
-#include <linux/vmalloc.h>
-
-static __inline__ void *drm_calloc_large(size_t nmemb, size_t size)
-{
-        if (size != 0 && nmemb > SIZE_MAX / size)
-                return NULL;
-
-        if (size * nmemb <= PAGE_SIZE)
-            return kcalloc(nmemb, size, GFP_KERNEL);
-
-        return vzalloc(size * nmemb);
-}
-
-/* Modeled after cairo's malloc_ab, it's like calloc but without the zeroing. */
-static __inline__ void *drm_malloc_ab(size_t nmemb, size_t size)
-{
-        if (size != 0 && nmemb > SIZE_MAX / size)
-                return NULL;
-
-        if (size * nmemb <= PAGE_SIZE)
-            return kmalloc(nmemb * size, GFP_KERNEL);
-
-        return vmalloc(size * nmemb);
-}
-
-static __inline__ void *drm_malloc_gfp(size_t nmemb, size_t size, gfp_t gfp)
-{
-        if (size != 0 && nmemb > SIZE_MAX / size)
-                return NULL;
-
-        if (size * nmemb <= PAGE_SIZE)
-                return kmalloc(nmemb * size, gfp);
-
-        if (gfp & __GFP_RECLAIMABLE) {
-                void *ptr = kmalloc(nmemb * size,
-                                    gfp | __GFP_NOWARN | __GFP_NORETRY);
-                if (ptr)
-                        return ptr;
-        }
-
-        return __vmalloc(size * nmemb, gfp, PAGE_KERNEL);
-}
-
-static __inline void drm_free_large(void *ptr)
-{
-        kvfree(ptr);
-}
-
-#endif
diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h
index c01c328f6cc8..85984b208218 100644
--- a/include/drm/drm_modeset_helper_vtables.h
+++ b/include/drm/drm_modeset_helper_vtables.h
@@ -106,6 +106,40 @@ struct drm_crtc_helper_funcs {
         void (*commit)(struct drm_crtc *crtc);
 
         /**
+         * @mode_valid:
+         *
+         * This callback is used to check if a specific mode is valid in this
+         * crtc. This should be implemented if the crtc has some sort of
+         * restriction in the modes it can display. For example, a given crtc
+         * may be responsible to set a clock value. If the clock can not
+         * produce all the values for the available modes then this callback
+         * can be used to restrict the number of modes to only the ones that
+         * can be displayed.
+         *
+         * This hook is used by the probe helpers to filter the mode list in
+         * drm_helper_probe_single_connector_modes(), and it is used by the
+         * atomic helpers to validate modes supplied by userspace in
+         * drm_atomic_helper_check_modeset().
+         *
+         * This function is optional.
+         *
+         * NOTE:
+         *
+         * Since this function is both called from the check phase of an atomic
+         * commit, and the mode validation in the probe paths it is not allowed
+         * to look at anything else but the passed-in mode, and validate it
+         * against configuration-invariant hardward constraints. Any further
+         * limits which depend upon the configuration can only be checked in
+         * @mode_fixup or @atomic_check.
+         *
+         * RETURNS:
+         *
+         * drm_mode_status Enum
+         */
+        enum drm_mode_status (*mode_valid)(struct drm_crtc *crtc,
+                                           const struct drm_display_mode *mode);
+
+        /**
          * @mode_fixup:
          *
          * This callback is used to validate a mode. The parameter mode is the
@@ -113,7 +147,8 @@ struct drm_crtc_helper_funcs {
          * encoders need to be fed with. Note that this is the inverse semantics
          * of the meaning for the &drm_encoder and &drm_bridge_funcs.mode_fixup
          * vfunc. If the CRTC cannot support the requested conversion from mode
-         * to adjusted_mode it should reject the modeset.
+         * to adjusted_mode it should reject the modeset. See also
+         * &drm_crtc_state.adjusted_mode for more details.
          *
          * This function is used by both legacy CRTC helpers and atomic helpers.
          * With atomic helpers it is optional.
@@ -130,22 +165,17 @@ struct drm_crtc_helper_funcs {
          * allowed.
          *
          * Atomic drivers which need to inspect and adjust more state should
-         * instead use the @atomic_check callback.
-         *
-         * Also beware that neither core nor helpers filter modes before
-         * passing them to the driver: While the list of modes that is
-         * advertised to userspace is filtered using the
-         * &drm_connector.mode_valid callback, neither the core nor the helpers
-         * do any filtering on modes passed in from userspace when setting a
-         * mode. It is therefore possible for userspace to pass in a mode that
-         * was previously filtered out using &drm_connector.mode_valid or add a
-         * custom mode that wasn't probed from EDID or similar to begin with.
-         * Even though this is an advanced feature and rarely used nowadays,
-         * some users rely on being able to specify modes manually so drivers
-         * must be prepared to deal with it. Specifically this means that all
-         * drivers need not only validate modes in &drm_connector.mode_valid but
-         * also in this or in the &drm_encoder_helper_funcs.mode_fixup callback
-         * to make sure invalid modes passed in from userspace are rejected.
+         * instead use the @atomic_check callback, but note that they're not
+         * perfectly equivalent: @mode_valid is called from
+         * drm_atomic_helper_check_modeset(), but @atomic_check is called from
+         * drm_atomic_helper_check_planes(), because originally it was meant for
+         * plane update checks only.
+         *
+         * Also beware that userspace can request its own custom modes, neither
+         * core nor helpers filter modes to the list of probe modes reported by
+         * the GETCONNECTOR IOCTL and stored in &drm_connector.modes. To ensure
+         * that modes are filtered consistently put any CRTC constraints and
+         * limits checks into @mode_valid.
          *
          * RETURNS:
          *
@@ -341,6 +371,12 @@ struct drm_crtc_helper_funcs {
          * state objects passed-in or assembled in the overall &drm_atomic_state
          * update tracking structure.
          *
+         * Also beware that userspace can request its own custom modes, neither
+         * core nor helpers filter modes to the list of probe modes reported by
+         * the GETCONNECTOR IOCTL and stored in &drm_connector.modes. To ensure
+         * that modes are filtered consistently put any CRTC constraints and
+         * limits checks into @mode_valid.
+         *
          * RETURNS:
          *
          * 0 on success, -EINVAL if the state or the transition can't be
@@ -457,13 +493,48 @@ struct drm_encoder_helper_funcs {
         void (*dpms)(struct drm_encoder *encoder, int mode);
 
         /**
+         * @mode_valid:
+         *
+         * This callback is used to check if a specific mode is valid in this
+         * encoder. This should be implemented if the encoder has some sort
+         * of restriction in the modes it can display. For example, a given
+         * encoder may be responsible to set a clock value. If the clock can
+         * not produce all the values for the available modes then this callback
+         * can be used to restrict the number of modes to only the ones that
+         * can be displayed.
+         *
+         * This hook is used by the probe helpers to filter the mode list in
+         * drm_helper_probe_single_connector_modes(), and it is used by the
+         * atomic helpers to validate modes supplied by userspace in
+         * drm_atomic_helper_check_modeset().
+         *
+         * This function is optional.
+         *
+         * NOTE:
+         *
+         * Since this function is both called from the check phase of an atomic
+         * commit, and the mode validation in the probe paths it is not allowed
+         * to look at anything else but the passed-in mode, and validate it
+         * against configuration-invariant hardward constraints. Any further
+         * limits which depend upon the configuration can only be checked in
+         * @mode_fixup or @atomic_check.
+         *
+         * RETURNS:
+         *
+         * drm_mode_status Enum
+         */
+        enum drm_mode_status (*mode_valid)(struct drm_encoder *crtc,
+                                           const struct drm_display_mode *mode);
+
+        /**
          * @mode_fixup:
          *
          * This callback is used to validate and adjust a mode. The parameter
          * mode is the display mode that should be fed to the next element in
          * the display chain, either the final &drm_connector or a &drm_bridge.
          * The parameter adjusted_mode is the input mode the encoder requires. It
-         * can be modified by this callback and does not need to match mode.
+         * can be modified by this callback and does not need to match mode. See
+         * also &drm_crtc_state.adjusted_mode for more details.
          *
          * This function is used by both legacy CRTC helpers and atomic helpers.
          * This hook is optional.
@@ -480,23 +551,15 @@ struct drm_encoder_helper_funcs {
          * allowed.
          *
          * Atomic drivers which need to inspect and adjust more state should
-         * instead use the @atomic_check callback.
-         *
-         * Also beware that neither core nor helpers filter modes before
-         * passing them to the driver: While the list of modes that is
-         * advertised to userspace is filtered using the connector's
-         * &drm_connector_helper_funcs.mode_valid callback, neither the core nor
-         * the helpers do any filtering on modes passed in from userspace when
-         * setting a mode. It is therefore possible for userspace to pass in a
-         * mode that was previously filtered out using
-         * &drm_connector_helper_funcs.mode_valid or add a custom mode that
-         * wasn't probed from EDID or similar to begin with.  Even though this
-         * is an advanced feature and rarely used nowadays, some users rely on
-         * being able to specify modes manually so drivers must be prepared to
-         * deal with it. Specifically this means that all drivers need not only
-         * validate modes in &drm_connector.mode_valid but also in this or in
-         * the &drm_crtc_helper_funcs.mode_fixup callback to make sure
-         * invalid modes passed in from userspace are rejected.
+         * instead use the @atomic_check callback. If @atomic_check is used,
+         * this hook isn't called since @atomic_check allows a strict superset
+         * of the functionality of @mode_fixup.
+         *
+         * Also beware that userspace can request its own custom modes, neither
+         * core nor helpers filter modes to the list of probe modes reported by
+         * the GETCONNECTOR IOCTL and stored in &drm_connector.modes. To ensure
+         * that modes are filtered consistently put any encoder constraints and
+         * limits checks into @mode_valid.
          *
          * RETURNS:
          *
@@ -677,6 +740,11 @@ struct drm_encoder_helper_funcs {
          * update the CRTC to match what the encoder needs for the requested
          * connector.
          *
+         * Since this provides a strict superset of the functionality of
+         * @mode_fixup (the requested and adjusted modes are both available
+         * through the passed in &struct drm_crtc_state) @mode_fixup is not
+         * called when @atomic_check is implemented.
+         *
          * This function is used by the atomic helpers, but it is optional.
          *
          * NOTE:
@@ -686,6 +754,12 @@ struct drm_encoder_helper_funcs {
          * state objects passed-in or assembled in the overall &drm_atomic_state
          * update tracking structure.
          *
+         * Also beware that userspace can request its own custom modes, neither
+         * core nor helpers filter modes to the list of probe modes reported by
+         * the GETCONNECTOR IOCTL and stored in &drm_connector.modes. To ensure
+         * that modes are filtered consistently put any encoder constraints and
+         * limits checks into @mode_valid.
+         *
          * RETURNS:
          *
          * 0 on success, -EINVAL if the state or the transition can't be
@@ -795,13 +869,20 @@ struct drm_connector_helper_funcs {
          * (which is usually derived from the EDID data block from the sink).
          * See e.g. drm_helper_probe_single_connector_modes().
          *
+         * This function is optional.
+         *
          * NOTE:
          *
          * This only filters the mode list supplied to userspace in the
-         * GETCONNECOTR IOCTL. Userspace is free to create modes of its own and
-         * ask the kernel to use them. It this case the atomic helpers or legacy
-         * CRTC helpers will not call this function. Drivers therefore must
-         * still fully validate any mode passed in in a modeset request.
+         * GETCONNECTOR IOCTL. Compared to &drm_encoder_helper_funcs.mode_valid,
+         * &drm_crtc_helper_funcs.mode_valid and &drm_bridge_funcs.mode_valid,
+         * which are also called by the atomic helpers from
+         * drm_atomic_helper_check_modeset(). This allows userspace to force and
+         * ignore sink constraint (like the pixel clock limits in the screen's
+         * EDID), which is useful for e.g. testing, or working around a broken
+         * EDID. Any source hardware constraint (which always need to be
+         * enforced) therefore should be checked in one of the above callbacks,
+         * and not this one here.
          *
          * To avoid races with concurrent connector state updates, the helper
          * libraries always call this with the &drm_mode_config.connection_mutex
diff --git a/include/drm/drm_panel.h b/include/drm/drm_panel.h
index 1b364b0100f4..14ac240a1f64 100644
--- a/include/drm/drm_panel.h
+++ b/include/drm/drm_panel.h
@@ -24,8 +24,10 @@
 #ifndef __DRM_PANEL_H__
 #define __DRM_PANEL_H__
 
+#include <linux/errno.h>
 #include <linux/list.h>
 
+struct device_node;
 struct drm_connector;
 struct drm_device;
 struct drm_panel;
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index 6bbd34d25a8d..990d529f823c 100644
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -30,10 +30,6 @@
 #ifndef _TTM_BO_DRIVER_H_
 #define _TTM_BO_DRIVER_H_
 
-#include <ttm/ttm_bo_api.h>
-#include <ttm/ttm_memory.h>
-#include <ttm/ttm_module.h>
-#include <ttm/ttm_placement.h>
 #include <drm/drm_mm.h>
 #include <drm/drm_global.h>
 #include <drm/drm_vma_manager.h>
@@ -42,6 +38,11 @@
 #include <linux/spinlock.h>
 #include <linux/reservation.h>
 
+#include "ttm_bo_api.h"
+#include "ttm_memory.h"
+#include "ttm_module.h"
+#include "ttm_placement.h"
+
 #define TTM_MAX_BO_PRIORITY     4U
 
 struct ttm_backend_func {
diff --git a/include/drm/ttm/ttm_execbuf_util.h b/include/drm/ttm/ttm_execbuf_util.h
index 47f35b8e6d09..b0fdd1980034 100644
--- a/include/drm/ttm/ttm_execbuf_util.h
+++ b/include/drm/ttm/ttm_execbuf_util.h
@@ -31,9 +31,10 @@
 #ifndef _TTM_EXECBUF_UTIL_H_
 #define _TTM_EXECBUF_UTIL_H_
 
-#include <ttm/ttm_bo_api.h>
 #include <linux/list.h>
 
+#include "ttm_bo_api.h"
+
 /**
  * struct ttm_validate_buffer
  *
diff --git a/include/drm/ttm/ttm_lock.h b/include/drm/ttm/ttm_lock.h
index 2902beb5f689..0c3af9836863 100644
--- a/include/drm/ttm/ttm_lock.h
+++ b/include/drm/ttm/ttm_lock.h
@@ -49,10 +49,11 @@
 #ifndef _TTM_LOCK_H_
 #define _TTM_LOCK_H_
 
-#include <ttm/ttm_object.h>
 #include <linux/wait.h>
 #include <linux/atomic.h>
 
+#include "ttm_object.h"
+
 /**
  * struct ttm_lock
  *
diff --git a/include/drm/ttm/ttm_object.h b/include/drm/ttm/ttm_object.h
index 1487011fe057..a98bfeb4239e 100644
--- a/include/drm/ttm/ttm_object.h
+++ b/include/drm/ttm/ttm_object.h
@@ -42,7 +42,8 @@
 #include <linux/kref.h>
 #include <linux/rcupdate.h>
 #include <linux/dma-buf.h>
-#include <ttm/ttm_memory.h>
+
+#include "ttm_memory.h"
 
 /**
  * enum ttm_ref_type
diff --git a/include/linux/amba/clcd-regs.h b/include/linux/amba/clcd-regs.h
index 69c0e2143003..516a6fda83c5 100644
--- a/include/linux/amba/clcd-regs.h
+++ b/include/linux/amba/clcd-regs.h
@@ -39,12 +39,17 @@
 #define CLCD_PALL               0x00000200
 #define CLCD_PALETTE            0x00000200
 
+#define TIM2_PCD_LO_MASK        GENMASK(4, 0)
+#define TIM2_PCD_LO_BITS        5
 #define TIM2_CLKSEL             (1 << 5)
 #define TIM2_IVS                (1 << 11)
 #define TIM2_IHS                (1 << 12)
 #define TIM2_IPC                (1 << 13)
 #define TIM2_IOE                (1 << 14)
 #define TIM2_BCD                (1 << 26)
+#define TIM2_PCD_HI_MASK        GENMASK(31, 27)
+#define TIM2_PCD_HI_BITS        5
+#define TIM2_PCD_HI_SHIFT       27
 
 #define CNTL_LCDEN              (1 << 0)
 #define CNTL_LCDBPP1            (0 << 1)
diff --git a/include/linux/sync_file.h b/include/linux/sync_file.h
index d37beefdfbd5..5726107963b2 100644
--- a/include/linux/sync_file.h
+++ b/include/linux/sync_file.h
@@ -23,7 +23,6 @@
 /**
  * struct sync_file - sync file to export to the userspace
  * @file:               file representing this fence
- * @name:               name of sync_file.  Useful for debugging
  * @sync_file_list:     membership in global file list
  * @wq:                 wait queue for fence signaling
  * @fence:              fence with the fences in the sync_file
@@ -31,7 +30,14 @@
  */
 struct sync_file {
         struct file             *file;
-        char                    name[32];
+        /**
+         * @user_name:
+         *
+         * Name of the sync file provided by userspace, for merged fences.
+         * Otherwise generated through driver callbacks (in which case the
+         * entire array is 0).
+         */
+        char                    user_name[32];
 #ifdef CONFIG_DEBUG_FS
         struct list_head        sync_file_list;
 #endif
@@ -46,5 +52,6 @@ struct sync_file {
 
 struct sync_file *sync_file_create(struct dma_fence *fence);
 struct dma_fence *sync_file_get_fence(int fd);
+char *sync_file_get_name(struct sync_file *sync_file, char *buf, int len);
 
 #endif /* _LINUX_SYNC_H */
diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
index 8c67fc03d53d..403339f98a92 100644
--- a/include/uapi/drm/drm_mode.h
+++ b/include/uapi/drm/drm_mode.h
@@ -75,7 +75,7 @@ extern "C" {
   * (define not exposed to user space).
   */
 #define DRM_MODE_FLAG_3D_MASK                   (0x1f<<14)
-#define  DRM_MODE_FLAG_3D_NONE                  (0<<14)
+#define  DRM_MODE_FLAG_3D_NONE          (0<<14)
 #define  DRM_MODE_FLAG_3D_FRAME_PACKING         (1<<14)
 #define  DRM_MODE_FLAG_3D_FIELD_ALTERNATIVE     (2<<14)
 #define  DRM_MODE_FLAG_3D_LINE_ALTERNATIVE      (3<<14)
@@ -127,6 +127,53 @@ extern "C" {
 #define DRM_MODE_LINK_STATUS_GOOD       0
 #define DRM_MODE_LINK_STATUS_BAD        1
 
+/*
+ * DRM_MODE_ROTATE_<degrees>
+ *
+ * Signals that a drm plane is been rotated <degrees> degrees in counter
+ * clockwise direction.
+ *
+ * This define is provided as a convenience, looking up the property id
+ * using the name->prop id lookup is the preferred method.
+ */
+#define DRM_MODE_ROTATE_0       (1<<0)
+#define DRM_MODE_ROTATE_90      (1<<1)
+#define DRM_MODE_ROTATE_180     (1<<2)
+#define DRM_MODE_ROTATE_270     (1<<3)
+
+/*
+ * DRM_MODE_ROTATE_MASK
+ *
+ * Bitmask used to look for drm plane rotations.
+ */
+#define DRM_MODE_ROTATE_MASK (\
+                DRM_MODE_ROTATE_0  | \
+                DRM_MODE_ROTATE_90  | \
+                DRM_MODE_ROTATE_180 | \
+                DRM_MODE_ROTATE_270)
+
+/*
+ * DRM_MODE_REFLECT_<axis>
+ *
+ * Signals that the contents of a drm plane is reflected in the <axis> axis,
+ * in the same way as mirroring.
+ *
+ * This define is provided as a convenience, looking up the property id
+ * using the name->prop id lookup is the preferred method.
+ */
+#define DRM_MODE_REFLECT_X      (1<<4)
+#define DRM_MODE_REFLECT_Y      (1<<5)
+
+/*
+ * DRM_MODE_REFLECT_MASK
+ *
+ * Bitmask used to look for drm plane reflections.
+ */
+#define DRM_MODE_REFLECT_MASK (\
+                DRM_MODE_REFLECT_X | \
+                DRM_MODE_REFLECT_Y)
+
+
 struct drm_mode_modeinfo {
         __u32 clock;
         __u16 hdisplay;