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

Commit 78f27b1c authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Daniel Vetter
Browse files

drm/msm: fix include notation and remove -Iinclude/drm flag 



Include <drm/*.h> instead of relative path from include/drm, then
remove the -Iinclude/drm compiler flag.

While we are here, sort the touched parts with public headers first.
mdp4_kms.h must declare struct device_node to be self-contained.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1493009447-31524-11-git-send-email-yamada.masahiro@socionext.com
parent 277b9fca

drivers/gpu/drm/msm/Makefile

+1 −1
Original line number Diff line number Diff line 
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 := \

drivers/gpu/drm/msm/dsi/dsi.h

+3 −3
Original line number Diff line number Diff line
@@ -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"

drivers/gpu/drm/msm/edp/edp.h

+2 −2
Original line number Diff line number Diff line
@@ -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))

drivers/gpu/drm/msm/edp/edp_ctrl.c

+3 −3
Original line number Diff line number Diff line
@@ -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"

drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c

+5 −5
Original line number Diff line number Diff line
@@ -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;