drm/msm/mdp5: Prepare for merging video and command encoders (df8a71d2) · Commits · 戴 / test

drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c

+24 −7

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ static const struct drm_encoder_funcs mdp5_encoder_funcs = {
		.destroy = mdp5_encoder_destroy,
		};

		static void mdp5_encoder_mode_set(struct drm_encoder *encoder,
		static void mdp5_vid_encoder_mode_set(struct drm_encoder *encoder,
		struct drm_display_mode *mode,
		struct drm_display_mode *adjusted_mode)
		{
		@@ -221,7 +221,7 @@ static void mdp5_encoder_mode_set(struct drm_encoder *encoder,
		mdp5_encoder->ctl);
		}

		static void mdp5_encoder_disable(struct drm_encoder *encoder)
		static void mdp5_vid_encoder_disable(struct drm_encoder *encoder)
		{
		struct mdp5_encoder *mdp5_encoder = to_mdp5_encoder(encoder);
		struct mdp5_kms *mdp5_kms = get_kms(encoder);
		@@ -256,7 +256,7 @@ static void mdp5_encoder_disable(struct drm_encoder *encoder)
		mdp5_encoder->enabled = false;
		}

		static void mdp5_encoder_enable(struct drm_encoder *encoder)
		static void mdp5_vid_encoder_enable(struct drm_encoder *encoder)
		{
		struct mdp5_encoder *mdp5_encoder = to_mdp5_encoder(encoder);
		struct mdp5_kms *mdp5_kms = get_kms(encoder);
		@@ -279,6 +279,23 @@ static void mdp5_encoder_enable(struct drm_encoder *encoder)
		mdp5_encoder->enabled = true;
		}

		static void mdp5_encoder_mode_set(struct drm_encoder *encoder,
		struct drm_display_mode *mode,
		struct drm_display_mode *adjusted_mode)
		{
		mdp5_vid_encoder_mode_set(encoder, mode, adjusted_mode);
		}

		static void mdp5_encoder_disable(struct drm_encoder *encoder)
		{
		mdp5_vid_encoder_disable(encoder);
		}

		static void mdp5_encoder_enable(struct drm_encoder *encoder)
		{
		mdp5_vid_encoder_enable(encoder);
		}

		static const struct drm_encoder_helper_funcs mdp5_encoder_helper_funcs = {
		.mode_set = mdp5_encoder_mode_set,
		.disable = mdp5_encoder_disable,
		@@ -303,7 +320,7 @@ u32 mdp5_encoder_get_framecount(struct drm_encoder *encoder)
		return mdp5_read(mdp5_kms, REG_MDP5_INTF_FRAME_COUNT(intf));
		}

		int mdp5_encoder_set_split_display(struct drm_encoder *encoder,
		int mdp5_vid_encoder_set_split_display(struct drm_encoder *encoder,
		struct drm_encoder *slave_encoder)
		{
		struct mdp5_encoder *mdp5_encoder = to_mdp5_encoder(encoder);

drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -148,7 +148,8 @@ static int mdp5_set_split_display(struct msm_kms *kms,
		return mdp5_cmd_encoder_set_split_display(encoder,
		slave_encoder);
		else
		return mdp5_encoder_set_split_display(encoder, slave_encoder);
		return mdp5_vid_encoder_set_split_display(encoder,
		slave_encoder);
		}

		static void mdp5_set_encoder_mode(struct msm_kms *kms,

drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -244,7 +244,7 @@ struct drm_crtc mdp5_crtc_init(struct drm_device dev,

		struct drm_encoder mdp5_encoder_init(struct drm_device dev,
		struct mdp5_interface intf, struct mdp5_ctl ctl);
		int mdp5_encoder_set_split_display(struct drm_encoder *encoder,
		int mdp5_vid_encoder_set_split_display(struct drm_encoder *encoder,
		struct drm_encoder *slave_encoder);
		void mdp5_encoder_set_intf_mode(struct drm_encoder *encoder, bool cmd_mode);
		int mdp5_encoder_get_linecount(struct drm_encoder *encoder);

Admin message