Merge "drm/msm/sde: correct crtc client type for writeback" (57a2d5d2) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/drm/msm/sde/sde_crtc.h

+2 −4

Original line number	Diff line number	Diff line
		@@ -347,7 +347,6 @@ struct sde_crtc_respool {
		* @base: Base drm crtc state structure
		* @connectors : Currently associated drm connectors
		* @num_connectors: Number of associated drm connectors
		* @intf_mode : Interface mode of the primary connector
		* @rsc_client : sde rsc client when mode is valid
		* @is_ppsplit : Whether current topology requires PPSplit special handling
		* @bw_control : true if bw/clk controlled by core bw/clk properties
		@@ -377,7 +376,6 @@ struct sde_crtc_state {

		struct drm_connector *connectors[MAX_CONNECTORS];
		int num_connectors;
		enum sde_intf_mode intf_mode;
		struct sde_rsc_client *rsc_client;
		bool rsc_update;
		bool bw_control;
		@@ -543,8 +541,8 @@ static inline enum sde_crtc_client_type sde_crtc_get_client_type(
		if (!cstate)
		return NRT_CLIENT;

		return cstate->rsc_client ? RT_RSC_CLIENT :
		(cstate->intf_mode == INTF_MODE_WB_LINE ? NRT_CLIENT : RT_CLIENT);
		return sde_crtc_get_intf_mode(crtc) == INTF_MODE_WB_LINE ? NRT_CLIENT :
		(cstate->rsc_client ? RT_RSC_CLIENT : RT_CLIENT);
		}

		/**