Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b06b31d5 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge branch 'topic/mode_fixup-optional' into topic/drm-misc 



Pull in pile of patches from Carlos to remove now redundant mode_fixup
hooks for encoders.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents 49f718c5 cc92da51

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

+0 −8
Original line number Diff line number Diff line
@@ -3624,16 +3624,8 @@ dce_v10_0_ext_dpms(struct drm_encoder *encoder, int mode) 


}



static bool dce_v10_0_ext_mode_fixup(struct drm_encoder *encoder,

				    const struct drm_display_mode *mode,

				    struct drm_display_mode *adjusted_mode)

{

	return true;

}



static const struct drm_encoder_helper_funcs dce_v10_0_ext_helper_funcs = {

	.dpms = dce_v10_0_ext_dpms,

	.mode_fixup = dce_v10_0_ext_mode_fixup,

	.prepare = dce_v10_0_ext_prepare,

	.mode_set = dce_v10_0_ext_mode_set,

	.commit = dce_v10_0_ext_commit,

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

+0 −8
Original line number Diff line number Diff line
@@ -3619,16 +3619,8 @@ dce_v11_0_ext_dpms(struct drm_encoder *encoder, int mode) 


}



static bool dce_v11_0_ext_mode_fixup(struct drm_encoder *encoder,

				    const struct drm_display_mode *mode,

				    struct drm_display_mode *adjusted_mode)

{

	return true;

}



static const struct drm_encoder_helper_funcs dce_v11_0_ext_helper_funcs = {

	.dpms = dce_v11_0_ext_dpms,

	.mode_fixup = dce_v11_0_ext_mode_fixup,

	.prepare = dce_v11_0_ext_prepare,

	.mode_set = dce_v11_0_ext_mode_set,

	.commit = dce_v11_0_ext_commit,

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

+0 −8
Original line number Diff line number Diff line
@@ -3554,16 +3554,8 @@ dce_v8_0_ext_dpms(struct drm_encoder *encoder, int mode) 


}



static bool dce_v8_0_ext_mode_fixup(struct drm_encoder *encoder,

				    const struct drm_display_mode *mode,

				    struct drm_display_mode *adjusted_mode)

{

	return true;

}



static const struct drm_encoder_helper_funcs dce_v8_0_ext_helper_funcs = {

	.dpms = dce_v8_0_ext_dpms,

	.mode_fixup = dce_v8_0_ext_mode_fixup,

	.prepare = dce_v8_0_ext_prepare,

	.mode_set = dce_v8_0_ext_mode_set,

	.commit = dce_v8_0_ext_commit,

drivers/gpu/drm/ast/ast_mode.c

+0 −8
Original line number Diff line number Diff line
@@ -710,13 +710,6 @@ static void ast_encoder_dpms(struct drm_encoder *encoder, int mode) 


}



static bool ast_mode_fixup(struct drm_encoder *encoder,

			   const struct drm_display_mode *mode,

			   struct drm_display_mode *adjusted_mode)

{

	return true;

}



static void ast_encoder_mode_set(struct drm_encoder *encoder,

			       struct drm_display_mode *mode,

			       struct drm_display_mode *adjusted_mode)
@@ -736,7 +729,6 @@ static void ast_encoder_commit(struct drm_encoder *encoder) 


static const struct drm_encoder_helper_funcs ast_enc_helper_funcs = {

	.dpms = ast_encoder_dpms,

	.mode_fixup = ast_mode_fixup,

	.prepare = ast_encoder_prepare,

	.commit = ast_encoder_commit,

	.mode_set = ast_encoder_mode_set,

drivers/gpu/drm/bochs/bochs_kms.c

+0 −8
Original line number Diff line number Diff line
@@ -152,13 +152,6 @@ static void bochs_crtc_init(struct drm_device *dev) 
	drm_crtc_helper_add(crtc, &bochs_helper_funcs);

}



static bool bochs_encoder_mode_fixup(struct drm_encoder *encoder,

				     const struct drm_display_mode *mode,

				     struct drm_display_mode *adjusted_mode)

{

	return true;

}



static void bochs_encoder_mode_set(struct drm_encoder *encoder,

				   struct drm_display_mode *mode,

				   struct drm_display_mode *adjusted_mode)
@@ -179,7 +172,6 @@ static void bochs_encoder_commit(struct drm_encoder *encoder) 


static const struct drm_encoder_helper_funcs bochs_encoder_helper_funcs = {

	.dpms = bochs_encoder_dpms,

	.mode_fixup = bochs_encoder_mode_fixup,

	.mode_set = bochs_encoder_mode_set,

	.prepare = bochs_encoder_prepare,

	.commit = bochs_encoder_commit,