Commit 8581d510 authored by Lowry Li (Arm Technology China)'s avatar Lowry Li (Arm Technology China) Committed by james qian wang (Arm Technology China)
Browse files

drm: Free the writeback_job when it with an empty fb 



Adds the check if the writeback_job with an empty fb, then it should
be freed in atomic_check phase.

With this change, the driver users will not check empty fb case any more.
So refined accordingly.

Signed-off-by: default avatarLowry Li (Arm Technology China) <lowry.li@arm.com>
Reviewed-by: default avatarLiviu Dudau <liviu.dudau@arm.com>
Reviewed-by: default avatarJames Qian Wang (Arm Technology China) <james.qian.wang@arm.com>
Signed-off-by: default avatarjames qian wang (Arm Technology China) <james.qian.wang@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1564571048-15029-2-git-send-email-lowry.li@arm.com
parent 21670bd7

drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c

+1 −2
Original line number Diff line number Diff line
@@ -43,9 +43,8 @@ komeda_wb_encoder_atomic_check(struct drm_encoder *encoder, 
	struct komeda_data_flow_cfg dflow;

	int err;



	if (!writeback_job || !writeback_job->fb) {

	if (!writeback_job)

		return 0;

	}



	if (!crtc_st->active) {

		DRM_DEBUG_ATOMIC("Cannot write the composition result out on a inactive CRTC.\n");

drivers/gpu/drm/arm/malidp_mw.c

+2 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ malidp_mw_encoder_atomic_check(struct drm_encoder *encoder, 
	struct drm_framebuffer *fb;

	int i, n_planes;



	if (!conn_state->writeback_job || !conn_state->writeback_job->fb)

	if (!conn_state->writeback_job)

		return 0;



	fb = conn_state->writeback_job->fb;
@@ -247,7 +247,7 @@ void malidp_mw_atomic_commit(struct drm_device *drm, 


	mw_state = to_mw_state(conn_state);



	if (conn_state->writeback_job && conn_state->writeback_job->fb) {

	if (conn_state->writeback_job) {

		struct drm_framebuffer *fb = conn_state->writeback_job->fb;



		DRM_DEV_DEBUG_DRIVER(drm->dev,

drivers/gpu/drm/drm_atomic.c

+9 −4
Original line number Diff line number Diff line
@@ -430,12 +430,17 @@ static int drm_atomic_connector_check(struct drm_connector *connector, 
		return -EINVAL;

	}



	if (writeback_job->out_fence && !writeback_job->fb) {

	if (!writeback_job->fb) {

		if (writeback_job->out_fence) {

			DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] requesting out-fence without framebuffer\n",

					 connector->base.id, connector->name);

			return -EINVAL;

		}



		drm_writeback_cleanup_job(writeback_job);

		state->writeback_job = NULL;

	}



	return 0;

}

drivers/gpu/drm/rcar-du/rcar_du_writeback.c

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static int rcar_du_wb_enc_atomic_check(struct drm_encoder *encoder, 
	struct drm_device *dev = encoder->dev;

	struct drm_framebuffer *fb;



	if (!conn_state->writeback_job || !conn_state->writeback_job->fb)

	if (!conn_state->writeback_job)

		return 0;



	fb = conn_state->writeback_job->fb;
@@ -221,7 +221,7 @@ void rcar_du_writeback_setup(struct rcar_du_crtc *rcrtc, 
	unsigned int i;



	state = rcrtc->writeback.base.state;

	if (!state || !state->writeback_job || !state->writeback_job->fb)

	if (!state || !state->writeback_job)

		return;



	fb = state->writeback_job->fb;

drivers/gpu/drm/vc4/vc4_txp.c

+2 −3
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static int vc4_txp_connector_atomic_check(struct drm_connector *conn, 
	int i;



	conn_state = drm_atomic_get_new_connector_state(state, conn);

	if (!conn_state->writeback_job || !conn_state->writeback_job->fb)

	if (!conn_state->writeback_job)

		return 0;



	crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc);
@@ -269,8 +269,7 @@ static void vc4_txp_connector_atomic_commit(struct drm_connector *conn, 
	u32 ctrl;

	int i;



	if (WARN_ON(!conn_state->writeback_job ||

		    !conn_state->writeback_job->fb))

	if (WARN_ON(!conn_state->writeback_job))

		return;



	mode = &conn_state->crtc->state->adjusted_mode;