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

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

drm/i915: rip out helper->disable noop functions 



Now that the driver is in control of whether it needs to disable
everything at take-over or not, we can rip this all out.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 76a39dbf

drivers/gpu/drm/i915/intel_crt.c

+0 −1
Original line number Diff line number Diff line
@@ -685,7 +685,6 @@ 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_noop,

};



static const struct drm_connector_funcs intel_crt_connector_funcs = {

drivers/gpu/drm/i915/intel_ddi.c

+0 −1
Original line number Diff line number Diff line
@@ -1481,7 +1481,6 @@ static const struct drm_encoder_funcs intel_ddi_funcs = { 
static const struct drm_encoder_helper_funcs intel_ddi_helper_funcs = {

	.mode_fixup = intel_ddi_mode_fixup,

	.mode_set = intel_ddi_mode_set,

	.disable = intel_encoder_noop,

};



void intel_ddi_init(struct drm_device *dev, enum port port)

drivers/gpu/drm/i915/intel_display.c

+0 −9
Original line number Diff line number Diff line
@@ -3718,10 +3718,6 @@ void intel_crtc_update_dpms(struct drm_crtc *crtc) 
	intel_crtc_update_sarea(crtc, enable);

}



static void intel_crtc_noop(struct drm_crtc *crtc)

{

}



static void intel_crtc_disable(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;
@@ -3770,10 +3766,6 @@ void intel_modeset_disable(struct drm_device *dev) 
	}

}



void intel_encoder_noop(struct drm_encoder *encoder)

{

}



void intel_encoder_destroy(struct drm_encoder *encoder)

{

	struct intel_encoder *intel_encoder = to_intel_encoder(encoder);
@@ -7277,7 +7269,6 @@ free_work: 
static struct drm_crtc_helper_funcs intel_helper_funcs = {

	.mode_set_base_atomic = intel_pipe_set_base_atomic,

	.load_lut = intel_crtc_load_lut,

	.disable = intel_crtc_noop,

};



bool intel_encoder_check_is_cloned(struct intel_encoder *encoder)

drivers/gpu/drm/i915/intel_dp.c

+0 −1
Original line number Diff line number Diff line
@@ -2561,7 +2561,6 @@ 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_noop,

};



static const struct drm_connector_funcs intel_dp_connector_funcs = {

drivers/gpu/drm/i915/intel_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -521,7 +521,6 @@ extern void intel_modeset_disable(struct drm_device *dev); 
extern void intel_crtc_restore_mode(struct drm_crtc *crtc);

extern void intel_crtc_load_lut(struct drm_crtc *crtc);

extern void intel_crtc_update_dpms(struct drm_crtc *crtc);

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);