Merge "drm/msm: add wrapper for PM runtime when not using mdp5" (b31361a5) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/drm/msm/msm_kms.h

+12 −3

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
		* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
		* Copyright (C) 2013 Red Hat
		* Author: Rob Clark <robdclark@gmail.com>
		*
		@@ -156,6 +156,8 @@ struct msm_kms mdp4_kms_init(struct drm_device dev) { return NULL; };
		int msm_mdss_init(struct drm_device *dev);
		void msm_mdss_destroy(struct drm_device *dev);
		struct msm_kms mdp5_kms_init(struct drm_device dev);
		int msm_mdss_enable(struct msm_mdss *mdss);
		int msm_mdss_disable(struct msm_mdss *mdss);
		#else
		static inline int msm_mdss_init(struct drm_device *dev)
		{
		@@ -168,11 +170,18 @@ static inline struct msm_kms mdp5_kms_init(struct drm_device dev)
		{
		return NULL;
		}
		static inline int msm_mdss_enable(struct msm_mdss *mdss)
		{
		return 0;
		}
		static inline int msm_mdss_disable(struct msm_mdss *mdss)
		{
		return 0;
		}

		#endif
		struct msm_kms sde_kms_init(struct drm_device dev);

		int msm_mdss_enable(struct msm_mdss *mdss);
		int msm_mdss_disable(struct msm_mdss *mdss);

		/**
		* Mode Set Utility Functions