diff options
| author | Dhaval Patel <pdhaval@codeaurora.org> | 2016-09-28 10:39:00 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-28 10:39:00 -0700 |
| commit | 04ea852bdbc42281cafca4ffbd2f5254a459e6fb (patch) | |
| tree | 7012e11f86f765bfdecae2f5634a570a275ccc09 | |
| parent | 517493cab65c10e645ac55f320b9307df9ce401e (diff) | |
| parent | f6de2100769aa45d095861310357737918b9de31 (diff) | |
Merge "drm/msm/sde: fix compilation issues in sde driver" into dev/msm-4.4-drm_kms
| -rw-r--r-- | drivers/gpu/drm/msm/sde/sde_encoder_phys_wb.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/sde/sde_fence.h | 10 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/sde_power_handle.h | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/drivers/gpu/drm/msm/sde/sde_encoder_phys_wb.c b/drivers/gpu/drm/msm/sde/sde_encoder_phys_wb.c index 54de5df638b0..f279a2817ca4 100644 --- a/drivers/gpu/drm/msm/sde/sde_encoder_phys_wb.c +++ b/drivers/gpu/drm/msm/sde/sde_encoder_phys_wb.c @@ -923,9 +923,10 @@ static void sde_encoder_phys_wb_destroy_debugfs( debugfs_remove_recursive(wb_enc->debugfs_root); } #else -static void sde_encoder_phys_wb_init_debugfs( +static int sde_encoder_phys_wb_init_debugfs( struct sde_encoder_phys *phys_enc, struct sde_kms *kms) { + return 0; } static void sde_encoder_phys_wb_destroy_debugfs( struct sde_encoder_phys *phys_enc) diff --git a/drivers/gpu/drm/msm/sde/sde_fence.h b/drivers/gpu/drm/msm/sde/sde_fence.h index c22f882bc32e..f0839cff1ad1 100644 --- a/drivers/gpu/drm/msm/sde/sde_fence.h +++ b/drivers/gpu/drm/msm/sde/sde_fence.h @@ -123,10 +123,10 @@ void sde_fence_signal(struct sde_fence *fence, bool is_error); #else static inline int sde_fence_init(void *dev, struct sde_fence *fence, - const char *name, - int offset) + const char *name) { /* do nothing */ + return 0; } static inline void sde_fence_deinit(struct sde_fence *fence) @@ -148,6 +148,12 @@ static inline void sde_fence_signal(struct sde_fence *fence, bool is_error) { /* do nothing */ } + +static inline int sde_fence_create(struct sde_fence *fence, uint64_t *val, + int offset) +{ + return 0; +} #endif /* IS_ENABLED(CONFIG_SW_SYNC) */ #endif /* _SDE_FENCE_H_ */ diff --git a/drivers/gpu/drm/msm/sde_power_handle.h b/drivers/gpu/drm/msm/sde_power_handle.h index 214b1d37abda..3e43d80d4f8e 100644 --- a/drivers/gpu/drm/msm/sde_power_handle.h +++ b/drivers/gpu/drm/msm/sde_power_handle.h @@ -60,9 +60,7 @@ struct sde_power_handle { struct list_head power_client_clist; struct mutex phandle_lock; u32 current_usecase_ndx; -#ifdef CONFIG_QCOM_BUS_SCALING u32 reg_bus_hdl; -#endif }; /** |