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

Commit 19519943 authored by Patrik Jakobsson's avatar Patrik Jakobsson
Browse files

drm/gma500: Unify encoder mode fixup 



Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
parent f35257a3

drivers/gpu/drm/gma500/cdv_intel_crt.c

+1 −8
Original line number Diff line number Diff line
@@ -81,13 +81,6 @@ static int cdv_intel_crt_mode_valid(struct drm_connector *connector, 
	return MODE_OK;

}



static bool cdv_intel_crt_mode_fixup(struct drm_encoder *encoder,

				 const struct drm_display_mode *mode,

				 struct drm_display_mode *adjusted_mode)

{

	return true;

}



static void cdv_intel_crt_mode_set(struct drm_encoder *encoder,

			       struct drm_display_mode *mode,

			       struct drm_display_mode *adjusted_mode)
@@ -224,7 +217,7 @@ static int cdv_intel_crt_set_property(struct drm_connector *connector, 


static const struct drm_encoder_helper_funcs cdv_intel_crt_helper_funcs = {

	.dpms = cdv_intel_crt_dpms,

	.mode_fixup = cdv_intel_crt_mode_fixup,

	.mode_fixup = gma_encoder_mode_fixup,

	.prepare = gma_encoder_prepare,

	.commit = gma_encoder_commit,

	.mode_set = cdv_intel_crt_mode_set,

drivers/gpu/drm/gma500/cdv_intel_hdmi.c

+1 −8
Original line number Diff line number Diff line
@@ -89,13 +89,6 @@ static void cdv_hdmi_mode_set(struct drm_encoder *encoder, 
	REG_READ(hdmi_priv->hdmi_reg);

}



static bool cdv_hdmi_mode_fixup(struct drm_encoder *encoder,

				  const struct drm_display_mode *mode,

				  struct drm_display_mode *adjusted_mode)

{

	return true;

}



static void cdv_hdmi_dpms(struct drm_encoder *encoder, int mode)

{

	struct drm_device *dev = encoder->dev;
@@ -262,7 +255,7 @@ static void cdv_hdmi_destroy(struct drm_connector *connector) 


static const struct drm_encoder_helper_funcs cdv_hdmi_helper_funcs = {

	.dpms = cdv_hdmi_dpms,

	.mode_fixup = cdv_hdmi_mode_fixup,

	.mode_fixup = gma_encoder_mode_fixup,

	.prepare = gma_encoder_prepare,

	.mode_set = cdv_hdmi_mode_set,

	.commit = gma_encoder_commit,

drivers/gpu/drm/gma500/gma_display.c

+7 −0
Original line number Diff line number Diff line
@@ -485,6 +485,13 @@ int gma_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) 
	return 0;

}



bool gma_encoder_mode_fixup(struct drm_encoder *encoder,

			    const struct drm_display_mode *mode,

			    struct drm_display_mode *adjusted_mode)

{

	return true;

}



bool gma_crtc_mode_fixup(struct drm_crtc *crtc,

			 const struct drm_display_mode *mode,

			 struct drm_display_mode *adjusted_mode)

drivers/gpu/drm/gma500/gma_display.h

+3 −0
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ extern void gma_crtc_restore(struct drm_crtc *crtc); 
extern void gma_encoder_prepare(struct drm_encoder *encoder);

extern void gma_encoder_commit(struct drm_encoder *encoder);

extern void gma_encoder_destroy(struct drm_encoder *encoder);

extern bool gma_encoder_mode_fixup(struct drm_encoder *encoder,

				   const struct drm_display_mode *mode,

				   struct drm_display_mode *adjusted_mode);



/* Common clock related functions */

extern const struct gma_limit_t *gma_limit(struct drm_crtc *crtc, int refclk);

drivers/gpu/drm/gma500/oaktrail_hdmi.c

+1 −8
Original line number Diff line number Diff line
@@ -523,13 +523,6 @@ static int oaktrail_hdmi_mode_valid(struct drm_connector *connector, 
	return MODE_OK;

}



static bool oaktrail_hdmi_mode_fixup(struct drm_encoder *encoder,

				 const struct drm_display_mode *mode,

				 struct drm_display_mode *adjusted_mode)

{

	return true;

}



static enum drm_connector_status

oaktrail_hdmi_detect(struct drm_connector *connector, bool force)

{
@@ -608,7 +601,7 @@ static void oaktrail_hdmi_destroy(struct drm_connector *connector) 


static const struct drm_encoder_helper_funcs oaktrail_hdmi_helper_funcs = {

	.dpms = oaktrail_hdmi_dpms,

	.mode_fixup = oaktrail_hdmi_mode_fixup,

	.mode_fixup = gma_encoder_mode_fixup,

	.prepare = gma_encoder_prepare,

	.mode_set = oaktrail_hdmi_mode_set,

	.commit = gma_encoder_commit,