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

Commit 1f703855 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: s/intel_encoder_disable/intel_encoder_noop 



Because that's what it is. Unfortunately we can't rip this out because
the fb helper has an incetious relationship with the crtc helper - it
likes to call disable_unused_functions, among other things.

Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 976f8a20

drivers/gpu/drm/i915/intel_crt.c

+1 −1
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ static void intel_crt_reset(struct drm_connector *connector) 
static const struct drm_encoder_helper_funcs crt_encoder_funcs = {

	.mode_fixup = intel_crt_mode_fixup,

	.mode_set = intel_crt_mode_set,

	.disable = intel_encoder_disable,

	.disable = intel_encoder_noop,

};



static const struct drm_connector_funcs intel_crt_connector_funcs = {

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -3553,7 +3553,7 @@ static void intel_crtc_disable(struct drm_crtc *crtc) 
	}

}



void intel_encoder_disable(struct drm_encoder *encoder)

void intel_encoder_noop(struct drm_encoder *encoder)

{

}

drivers/gpu/drm/i915/intel_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -2393,7 +2393,7 @@ static void intel_dp_encoder_destroy(struct drm_encoder *encoder) 
static const struct drm_encoder_helper_funcs intel_dp_helper_funcs = {

	.mode_fixup = intel_dp_mode_fixup,

	.mode_set = intel_dp_mode_set,

	.disable = intel_encoder_disable,

	.disable = intel_encoder_noop,

};



static const struct drm_connector_funcs intel_dp_connector_funcs = {

drivers/gpu/drm/i915/intel_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ extern bool intel_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode, 
			   int x, int y, struct drm_framebuffer *old_fb);

extern void intel_crtc_load_lut(struct drm_crtc *crtc);

extern void intel_crtc_update_dpms(struct drm_crtc *crtc);

extern void intel_encoder_disable(struct drm_encoder *encoder);

extern void intel_encoder_noop(struct drm_encoder *encoder);

extern void intel_encoder_destroy(struct drm_encoder *encoder);

extern void intel_encoder_dpms(struct intel_encoder *encoder, int mode);

extern bool intel_encoder_check_is_cloned(struct intel_encoder *encoder);

drivers/gpu/drm/i915/intel_dvo.c

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static void intel_dvo_destroy(struct drm_connector *connector) 
static const struct drm_encoder_helper_funcs intel_dvo_helper_funcs = {

	.mode_fixup = intel_dvo_mode_fixup,

	.mode_set = intel_dvo_mode_set,

	.disable = intel_encoder_disable,

	.disable = intel_encoder_noop,

};



static const struct drm_connector_funcs intel_dvo_connector_funcs = {