Merge branch 'drm-next' into drm-next-5.3

Backmerge drm-next and fix up conflicts due to drmP.h removal.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher
2019-06-25 08:42:25 -05:00
12984 changed files with 51604 additions and 121372 deletions

View File

@@ -23,6 +23,9 @@
*
*/
#include <linux/mm.h>
#include <linux/slab.h>
#include "dc.h"
#include "opp.h"
#include "color_gamma.h"

View File

@@ -23,6 +23,8 @@
*
*/
#include <linux/slab.h>
#include "dm_services.h"
#include "dc.h"
#include "mod_freesync.h"