Merge "drm/msm/sde: fix compilation issues in sde driver" into msm-4.8 (a6c9b6f3) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/drm/msm/sde/sde_encoder_phys_wb.c

+2 −1

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -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_ */

+0 −2

Original line number	Diff line number	Diff line
		@@ -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
		};

		/**