summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev
diff options
context:
space:
mode:
authorSachin Bhayare <sachin.bhayare@codeaurora.org>2016-01-08 17:59:48 +0530
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 21:17:59 -0700
commit92650b303e3a038ae11db1a6bf2977cd4b0e8ae8 (patch)
tree053ef575e1ff0fd1fc0d34b867a6a877bd88a38e /drivers/video/fbdev
parent5bcd9e74b2b1ff668d05ac3dfee37a6b11e2137d (diff)
msm: mdss: fix MDP3 compilation
Add missing header file, remove unused header file and structure element mdp3_img_data. Change-Id: I6a12a65f3ccb622927c3b69d599856299e7b8e65 Signed-off-by: Sachin Bhayare <sachin.bhayare@codeaurora.org>
Diffstat (limited to 'drivers/video/fbdev')
-rw-r--r--drivers/video/fbdev/msm/mdp3.c9
-rw-r--r--drivers/video/fbdev/msm/mdp3.h3
-rw-r--r--drivers/video/fbdev/msm/mdp3_ctrl.c3
3 files changed, 9 insertions, 6 deletions
diff --git a/drivers/video/fbdev/msm/mdp3.c b/drivers/video/fbdev/msm/mdp3.c
index 5c4bd238791b..db50d5cd2054 100644
--- a/drivers/video/fbdev/msm/mdp3.c
+++ b/drivers/video/fbdev/msm/mdp3.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
* Copyright (C) 2007 Google Incorporated
*
* This software is licensed under the terms of the GNU General Public
@@ -40,13 +40,10 @@
#include <linux/clk/msm-clk.h>
#include <linux/regulator/rpm-smd-regulator.h>
-#include <mach/board.h>
-#include <mach/hardware.h>
#include <linux/msm-bus.h>
#include <linux/msm-bus-board.h>
#include <linux/qcom_iommu.h>
#include <linux/msm_iommu_domains.h>
-#include <mach/msm_memtypes.h>
#include "mdp3.h"
#include "mdss_fb.h"
@@ -55,6 +52,10 @@
#include "mdp3_ppp.h"
#include "mdss_debug.h"
+#ifndef EXPORT_COMPAT
+#define EXPORT_COMPAT(x)
+#endif
+
#define MISR_POLL_SLEEP 2000
#define MISR_POLL_TIMEOUT 32000
#define MDP3_REG_CAPTURED_DSI_PCLK_MASK 1
diff --git a/drivers/video/fbdev/msm/mdp3.h b/drivers/video/fbdev/msm/mdp3.h
index 9795ea98242a..99f557321758 100644
--- a/drivers/video/fbdev/msm/mdp3.h
+++ b/drivers/video/fbdev/msm/mdp3.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, 2016, The Linux Foundation. All rights reserved.
* Copyright (C) 2007 Google Incorporated
*
* This program is free software; you can redistribute it and/or modify
@@ -166,6 +166,7 @@ struct mdp3_img_data {
int p_need;
struct file *srcp_file;
struct ion_handle *srcp_ihdl;
+ struct fd srcp_f;
};
extern struct mdp3_hw_resource *mdp3_res;
diff --git a/drivers/video/fbdev/msm/mdp3_ctrl.c b/drivers/video/fbdev/msm/mdp3_ctrl.c
index 88e202481839..fa12a98bc2d7 100644
--- a/drivers/video/fbdev/msm/mdp3_ctrl.c
+++ b/drivers/video/fbdev/msm/mdp3_ctrl.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -22,6 +22,7 @@
#include <linux/delay.h>
#include <linux/dma-buf.h>
+#include "mdss_dsi_clk.h"
#include "mdp3_ctrl.h"
#include "mdp3.h"
#include "mdp3_ppp.h"