Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7eb7c12 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'exynos-drm-next-for-v5.4' of... 

Merge tag 'exynos-drm-next-for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos

 into drm-next

- JUst one cleanup which drops the use of drmP.h header file.

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

From: Inki Dae <daeinki@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190901120619.3992-1-daeinki@gmail.com
parents 578d2342 226024b1

drivers/gpu/drm/exynos/exynos_drm_drv.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -8,12 +8,20 @@ 
 */

 */





#include <linux/component.h>

#include <linux/component.h>

#include <linux/dma-mapping.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/pm_runtime.h>

#include <linux/uaccess.h>





#include <drm/drm_atomic.h>

#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_drv.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_file.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_ioctl.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_vblank.h>

#include <drm/exynos_drm.h>

#include <drm/exynos_drm.h>





#include "exynos_drm_drv.h"

#include "exynos_drm_drv.h"

drivers/gpu/drm/exynos/exynos_drm_fimc.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,8 @@ 
#include <linux/regmap.h>

#include <linux/regmap.h>

#include <linux/spinlock.h>

#include <linux/spinlock.h>





#include <drm/drm_fourcc.h>

#include <drm/drm_print.h>

#include <drm/exynos_drm.h>

#include <drm/exynos_drm.h>





#include "exynos_drm_drv.h"

#include "exynos_drm_drv.h"

drivers/gpu/drm/exynos/exynos_drm_gsc.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ 
#include <linux/pm_runtime.h>

#include <linux/pm_runtime.h>

#include <linux/regmap.h>

#include <linux/regmap.h>





#include <drm/drm_fourcc.h>

#include <drm/drm_print.h>

#include <drm/exynos_drm.h>

#include <drm/exynos_drm.h>





#include "exynos_drm_drv.h"

#include "exynos_drm_drv.h"

drivers/gpu/drm/exynos/exynos_drm_ipp.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,10 @@ 
 * all copies or substantial portions of the Software.

 * all copies or substantial portions of the Software.

 */

 */





#include <drm/drmP.h>

#include <linux/uaccess.h>



#include <drm/drm_file.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_mode.h>

#include <drm/drm_mode.h>

#include <drm/exynos_drm.h>

#include <drm/exynos_drm.h>

drivers/gpu/drm/exynos/exynos_drm_ipp.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -6,8 +6,6 @@ 
#ifndef _EXYNOS_DRM_IPP_H_

#ifndef _EXYNOS_DRM_IPP_H_

#define _EXYNOS_DRM_IPP_H_

#define _EXYNOS_DRM_IPP_H_





#include <drm/drmP.h>



struct exynos_drm_ipp;

struct exynos_drm_ipp;

struct exynos_drm_ipp_task;

struct exynos_drm_ipp_task;