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

Commit 53190c71 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/msm: Nuke preclose hooks 



They only complete the page flip events to avoid oops when the drm
file closes. The core takes care of that now and we can remove this
code.

Cc: Rob Clark <robdclark@gmail.com>
Acked-by: default avatarDaniel Stone <daniels@collabora.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1453756616-28942-8-git-send-email-daniel.vetter@ffwll.ch
parent 4eced321

drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c

+0 −7
Original line number Diff line number Diff line
@@ -575,13 +575,6 @@ uint32_t mdp4_crtc_vblank(struct drm_crtc *crtc) 
	return mdp4_crtc->vblank.irqmask;

}



void mdp4_crtc_cancel_pending_flip(struct drm_crtc *crtc, struct drm_file *file)

{

	struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);

	DBG("%s: cancel: %p", mdp4_crtc->name, file);

	complete_flip(crtc, file);

}



/* set dma config, ie. the format the encoder wants. */

void mdp4_crtc_set_config(struct drm_crtc *crtc, uint32_t config)

{

drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c

+0 −11
Original line number Diff line number Diff line
@@ -179,16 +179,6 @@ static long mdp4_round_pixclk(struct msm_kms *kms, unsigned long rate, 
	}

}



static void mdp4_preclose(struct msm_kms *kms, struct drm_file *file)

{

	struct mdp4_kms *mdp4_kms = to_mdp4_kms(to_mdp_kms(kms));

	struct msm_drm_private *priv = mdp4_kms->dev->dev_private;

	unsigned i;



	for (i = 0; i < priv->num_crtcs; i++)

		mdp4_crtc_cancel_pending_flip(priv->crtcs[i], file);

}



static void mdp4_destroy(struct msm_kms *kms)

{

	struct mdp4_kms *mdp4_kms = to_mdp4_kms(to_mdp_kms(kms));
@@ -213,7 +203,6 @@ static const struct mdp_kms_funcs kms_funcs = { 
		.wait_for_crtc_commit_done = mdp4_wait_for_crtc_commit_done,

		.get_format      = mdp_get_format,

		.round_pixclk    = mdp4_round_pixclk,

		.preclose        = mdp4_preclose,

		.destroy         = mdp4_destroy,

	},

	.set_irqmask         = mdp4_set_irqmask,

drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h

+0 −1
Original line number Diff line number Diff line
@@ -199,7 +199,6 @@ struct drm_plane *mdp4_plane_init(struct drm_device *dev, 
		enum mdp4_pipe pipe_id, bool private_plane);



uint32_t mdp4_crtc_vblank(struct drm_crtc *crtc);

void mdp4_crtc_cancel_pending_flip(struct drm_crtc *crtc, struct drm_file *file);

void mdp4_crtc_set_config(struct drm_crtc *crtc, uint32_t config);

void mdp4_crtc_set_intf(struct drm_crtc *crtc, enum mdp4_intf intf, int mixer);

void mdp4_crtc_wait_for_commit_done(struct drm_crtc *crtc);

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

+0 −6
Original line number Diff line number Diff line
@@ -721,12 +721,6 @@ uint32_t mdp5_crtc_vblank(struct drm_crtc *crtc) 
	return mdp5_crtc->vblank.irqmask;

}



void mdp5_crtc_cancel_pending_flip(struct drm_crtc *crtc, struct drm_file *file)

{

	DBG("cancel: %p", file);

	complete_flip(crtc, file);

}



void mdp5_crtc_set_pipeline(struct drm_crtc *crtc,

		struct mdp5_interface *intf, struct mdp5_ctl *ctl)

{

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

+0 −11
Original line number Diff line number Diff line
@@ -117,16 +117,6 @@ static int mdp5_set_split_display(struct msm_kms *kms, 
		return mdp5_encoder_set_split_display(encoder, slave_encoder);

}



static void mdp5_preclose(struct msm_kms *kms, struct drm_file *file)

{

	struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(kms));

	struct msm_drm_private *priv = mdp5_kms->dev->dev_private;

	unsigned i;



	for (i = 0; i < priv->num_crtcs; i++)

		mdp5_crtc_cancel_pending_flip(priv->crtcs[i], file);

}



static void mdp5_destroy(struct msm_kms *kms)

{

	struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(kms));
@@ -164,7 +154,6 @@ static const struct mdp_kms_funcs kms_funcs = { 
		.get_format      = mdp_get_format,

		.round_pixclk    = mdp5_round_pixclk,

		.set_split_display = mdp5_set_split_display,

		.preclose        = mdp5_preclose,

		.destroy         = mdp5_destroy,

	},

	.set_irqmask         = mdp5_set_irqmask,