diff options
author | Rob Clark <robdclark@gmail.com> | 2013-11-27 16:29:59 -0500 |
---|---|---|
committer | Rob Clark <robdclark@gmail.com> | 2014-01-09 14:38:47 -0500 |
commit | 3083894f7f2963bb017c79636cd064eb0d7f05da (patch) | |
tree | c39a6e55dc974b4d0b905e4fc0075b7a6dad2c05 /drivers/gpu/drm/msm | |
parent | 859ae233cd0ee76b6143f948ba1cb6b0b4c342f8 (diff) |
drm/msm: COMPILE_TEST support
With a simple stub, we can get COMPILE_TEST support.
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm')
-rw-r--r-- | drivers/gpu/drm/msm/Kconfig | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/msm/msm_drv.h | 9 |
3 files changed, 10 insertions, 4 deletions
diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index f39ab7554fc9..bb103fb4519e 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig | |||
@@ -2,8 +2,7 @@ | |||
2 | config DRM_MSM | 2 | config DRM_MSM |
3 | tristate "MSM DRM" | 3 | tristate "MSM DRM" |
4 | depends on DRM | 4 | depends on DRM |
5 | depends on ARCH_MSM | 5 | depends on (ARCH_MSM && ARCH_MSM8960) || (ARM && COMPILE_TEST) |
6 | depends on ARCH_MSM8960 | ||
7 | select DRM_KMS_HELPER | 6 | select DRM_KMS_HELPER |
8 | select SHMEM | 7 | select SHMEM |
9 | select TMPFS | 8 | select TMPFS |
diff --git a/drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c b/drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c index 5e0dcae70ab5..3799ccc517b2 100644 --- a/drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c +++ b/drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c | |||
@@ -15,8 +15,6 @@ | |||
15 | * this program. If not, see <http://www.gnu.org/licenses/>. | 15 | * this program. If not, see <http://www.gnu.org/licenses/>. |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include <mach/clk.h> | ||
19 | |||
20 | #include "mdp4_kms.h" | 18 | #include "mdp4_kms.h" |
21 | 19 | ||
22 | #include "drm_crtc.h" | 20 | #include "drm_crtc.h" |
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index d39f0862b19e..a4c52cfe7fca 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h | |||
@@ -31,6 +31,15 @@ | |||
31 | #include <linux/types.h> | 31 | #include <linux/types.h> |
32 | #include <asm/sizes.h> | 32 | #include <asm/sizes.h> |
33 | 33 | ||
34 | |||
35 | #if defined(CONFIG_COMPILE_TEST) && !defined(CONFIG_ARCH_MSM) | ||
36 | /* stubs we need for compile-test: */ | ||
37 | static inline struct device *msm_iommu_get_ctx(const char *ctx_name) | ||
38 | { | ||
39 | return NULL; | ||
40 | } | ||
41 | #endif | ||
42 | |||
34 | #ifndef CONFIG_OF | 43 | #ifndef CONFIG_OF |
35 | #include <mach/board.h> | 44 | #include <mach/board.h> |
36 | #include <mach/socinfo.h> | 45 | #include <mach/socinfo.h> |