korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-19 18:24:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1493009447-31524-11-git-send-email-yamada.masahiro@socionext.com
This commit is contained in:
Masahiro Yamada 2017-04-24 13:50:28 +09:00 committed by Daniel Vetter
parent 277b9fca48
commit 78f27b1ce3
14 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/msm/Makefile
View File

@ -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 ccflags-$(CONFIG_DRM_MSM_DSI) += -Idrivers/gpu/drm/msm/dsi
msm-y := \ msm-y := \

6
drivers/gpu/drm/msm/dsi/dsi.h
View File

@ -17,9 +17,9 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include "drm_crtc.h" #include <drm/drm_crtc.h>
#include "drm_mipi_dsi.h" #include <drm/drm_mipi_dsi.h>
#include "drm_panel.h" #include <drm/drm_panel.h>
#include "msm_drv.h" #include "msm_drv.h"

4
drivers/gpu/drm/msm/edp/edp.h
View File

@ -18,9 +18,9 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/platform_device.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" #include "msm_drv.h"
#define edp_read(offset) msm_readl((offset)) #define edp_read(offset) msm_readl((offset))

6
drivers/gpu/drm/msm/edp/edp_ctrl.c
View File

@ -14,10 +14,10 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/regulator/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.h"
#include "edp.xml.h" #include "edp.xml.h"

10
drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
View File

@ -15,12 +15,12 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * 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/drm_mode.h>
#include "drm_crtc.h"
#include "drm_crtc_helper.h" #include "mdp4_kms.h"
#include "drm_flip_work.h"
struct mdp4_crtc { struct mdp4_crtc {
struct drm_crtc base; struct drm_crtc base;

6
drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c
View File

@ -17,10 +17,10 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * 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 "mdp4_kms.h"
#include "drm_crtc_helper.h"
struct mdp4_dsi_encoder { struct mdp4_dsi_encoder {
struct drm_encoder base; struct drm_encoder base;

7
drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c
View File

@ -15,12 +15,11 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h>
#include "mdp4_kms.h" #include "mdp4_kms.h"
#include "drm_crtc.h"
#include "drm_crtc_helper.h"
struct mdp4_dtv_encoder { struct mdp4_dtv_encoder {
struct drm_encoder base; struct drm_encoder base;
struct clk *hdmi_clk; struct clk *hdmi_clk;

4
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h
View File

@ -18,12 +18,14 @@
#ifndef __MDP4_KMS_H__ #ifndef __MDP4_KMS_H__
#define __MDP4_KMS_H__ #define __MDP4_KMS_H__
#include <drm/drm_panel.h>
#include "msm_drv.h" #include "msm_drv.h"
#include "msm_kms.h" #include "msm_kms.h"
#include "mdp/mdp_kms.h" #include "mdp/mdp_kms.h"
#include "mdp4.xml.h" #include "mdp4.xml.h"
#include "drm_panel.h" struct device_node;
struct mdp4_kms { struct mdp4_kms {
struct mdp_kms base; struct mdp_kms base;

6
drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c
View File

@ -16,10 +16,10 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * 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 "mdp4_kms.h"
#include "drm_crtc_helper.h"
struct mdp4_lcdc_encoder { struct mdp4_lcdc_encoder {
struct drm_encoder base; struct drm_encoder base;

6
drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c
View File

@ -11,10 +11,10 @@
* GNU General Public License for more details. * 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 "mdp5_kms.h"
#include "drm_crtc_helper.h"
static struct mdp5_kms *get_kms(struct drm_encoder *encoder) static struct mdp5_kms *get_kms(struct drm_encoder *encoder)
{ {

10
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
View File

@ -16,13 +16,13 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "mdp5_kms.h"
#include <linux/sort.h> #include <linux/sort.h>
#include <drm/drm_mode.h> #include <drm/drm_mode.h>
#include "drm_crtc.h" #include <drm/drm_crtc.h>
#include "drm_crtc_helper.h" #include <drm/drm_crtc_helper.h>
#include "drm_flip_work.h" #include <drm/drm_flip_work.h>
#include "mdp5_kms.h"
#define CURSOR_WIDTH 64 #define CURSOR_WIDTH 64
#define CURSOR_HEIGHT 64 #define CURSOR_HEIGHT 64

6
drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c
View File

@ -16,10 +16,10 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * 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 "mdp5_kms.h"
#include "drm_crtc_helper.h"
static struct mdp5_kms *get_kms(struct drm_encoder *encoder) static struct mdp5_kms *get_kms(struct drm_encoder *encoder)
{ {

6
drivers/gpu/drm/msm/msm_fb.c
View File

@ -15,12 +15,12 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * 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_drv.h"
#include "msm_kms.h" #include "msm_kms.h"
#include "drm_crtc.h"
#include "drm_crtc_helper.h"
struct msm_framebuffer { struct msm_framebuffer {
struct drm_framebuffer base; struct drm_framebuffer base;
const struct msm_format *format; const struct msm_format *format;

6
drivers/gpu/drm/msm/msm_fbdev.c
View File

@ -15,10 +15,10 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * 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 "msm_drv.h"
#include "drm_fb_helper.h"
#include "msm_gem.h" #include "msm_gem.h"
extern int msm_gem_mmap_obj(struct drm_gem_object *obj, extern int msm_gem_mmap_obj(struct drm_gem_object *obj,