From mboxrd@z Thu Jan 1 00:00:00 1970 From: "james qian wang (Arm Technology China)" Subject: Re: [v1,1/2] drm: Free the writeback_job when it with an empty fb Date: Mon, 23 Sep 2019 07:24:26 +0000 Message-ID: <20190923072419.GA17006@jamwan02-TSP300> References: <1564571048-15029-2-git-send-email-lowry.li@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <1564571048-15029-2-git-send-email-lowry.li@arm.com> Content-Language: en-US Content-ID: <2817BAE5E83DDB4F9DB84419C25E7931@eurprd08.prod.outlook.com> Sender: linux-kernel-owner@vger.kernel.org To: "Lowry Li (Arm Technology China)" Cc: Liviu Dudau , "maarten.lankhorst@linux.intel.com" , "seanpaul@chromium.org" , "airlied@linux.ie" , "daniel@ffwll.ch" , Brian Starkey , "linux-renesas-soc@vger.kernel.org" , nd , "maxime.ripard@bootlin.com" , "Jonathan Chai (Arm Technology China)" , "linux-kernel@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , "Julien Yin (Arm Technology China)" , "kieran.bingham+renesas@ideasonboard.com" , lauren List-Id: dri-devel@lists.freedesktop.org On Wed, Jul 31, 2019 at 11:04:38AM +0000, Lowry Li (Arm Technology China) w= rote: > From: "Lowry Li (Arm Technology China)" >=20 > Adds the check if the writeback_job with an empty fb, then it should > be freed in atomic_check phase. >=20 > With this change, the driver users will not check empty fb case any more. > So refined accordingly. >=20 > Signed-off-by: Lowry Li (Arm Technology China) > Reviewed-by: Liviu Dudau Looks good to me. Reviewed-by: James Qian Wang (Arm Technology China) And will push it to drm-misc-fixes James > --- > drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c | 3 +-- > drivers/gpu/drm/arm/malidp_mw.c | 4 ++-- > drivers/gpu/drm/drm_atomic.c | 13 +++++++++-= --- > drivers/gpu/drm/rcar-du/rcar_du_writeback.c | 4 ++-- > drivers/gpu/drm/vc4/vc4_txp.c | 5 ++--- > 5 files changed, 16 insertions(+), 13 deletions(-) >=20 > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c b/d= rivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c > index 617e1f7..d6103dd 100644 > --- a/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c > @@ -43,9 +43,8 @@ > struct komeda_data_flow_cfg dflow; > int err; > =20 > - if (!writeback_job || !writeback_job->fb) { > + if (!writeback_job) > return 0; > - } > =20 > if (!crtc_st->active) { > DRM_DEBUG_ATOMIC("Cannot write the composition result out on a inactiv= e CRTC.\n"); > diff --git a/drivers/gpu/drm/arm/malidp_mw.c b/drivers/gpu/drm/arm/malidp= _mw.c > index 2e81252..a59227b 100644 > --- a/drivers/gpu/drm/arm/malidp_mw.c > +++ b/drivers/gpu/drm/arm/malidp_mw.c > @@ -130,7 +130,7 @@ static void malidp_mw_connector_destroy(struct drm_co= nnector *connector) > struct drm_framebuffer *fb; > int i, n_planes; > =20 > - if (!conn_state->writeback_job || !conn_state->writeback_job->fb) > + if (!conn_state->writeback_job) > return 0; > =20 > fb =3D conn_state->writeback_job->fb; > @@ -247,7 +247,7 @@ void malidp_mw_atomic_commit(struct drm_device *drm, > =20 > mw_state =3D to_mw_state(conn_state); > =20 > - if (conn_state->writeback_job && conn_state->writeback_job->fb) { > + if (conn_state->writeback_job) { > struct drm_framebuffer *fb =3D conn_state->writeback_job->fb; > =20 > DRM_DEV_DEBUG_DRIVER(drm->dev, > diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c > index 419381a..14aeaf7 100644 > --- a/drivers/gpu/drm/drm_atomic.c > +++ b/drivers/gpu/drm/drm_atomic.c > @@ -430,10 +430,15 @@ static int drm_atomic_connector_check(struct drm_co= nnector *connector, > return -EINVAL; > } > =20 > - if (writeback_job->out_fence && !writeback_job->fb) { > - DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] requesting out-fence without frame= buffer\n", > - connector->base.id, connector->name); > - return -EINVAL; > + if (!writeback_job->fb) { > + if (writeback_job->out_fence) { > + DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] requesting out-fence without fram= ebuffer\n", > + connector->base.id, connector->name); > + return -EINVAL; > + } > + > + drm_writeback_cleanup_job(writeback_job); > + state->writeback_job =3D NULL; > } > =20 > return 0; > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_writeback.c b/drivers/gpu/dr= m/rcar-du/rcar_du_writeback.c > index ae07290..04efa78d 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_writeback.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_writeback.c > @@ -147,7 +147,7 @@ static int rcar_du_wb_enc_atomic_check(struct drm_enc= oder *encoder, > struct drm_device *dev =3D encoder->dev; > struct drm_framebuffer *fb; > =20 > - if (!conn_state->writeback_job || !conn_state->writeback_job->fb) > + if (!conn_state->writeback_job) > return 0; > =20 > fb =3D conn_state->writeback_job->fb; > @@ -221,7 +221,7 @@ void rcar_du_writeback_setup(struct rcar_du_crtc *rcr= tc, > unsigned int i; > =20 > state =3D rcrtc->writeback.base.state; > - if (!state || !state->writeback_job || !state->writeback_job->fb) > + if (!state || !state->writeback_job) > return; > =20 > fb =3D state->writeback_job->fb; > diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.= c > index 96f91c1..e92fa12 100644 > --- a/drivers/gpu/drm/vc4/vc4_txp.c > +++ b/drivers/gpu/drm/vc4/vc4_txp.c > @@ -229,7 +229,7 @@ static int vc4_txp_connector_atomic_check(struct drm_= connector *conn, > int i; > =20 > conn_state =3D 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; > =20 > crtc_state =3D drm_atomic_get_new_crtc_state(state, conn_state->crtc); > @@ -269,8 +269,7 @@ static void vc4_txp_connector_atomic_commit(struct dr= m_connector *conn, > u32 ctrl; > int i; > =20 > - if (WARN_ON(!conn_state->writeback_job || > - !conn_state->writeback_job->fb)) > + if (WARN_ON(!conn_state->writeback_job)) > return; > =20 > mode =3D &conn_state->crtc->state->adjusted_mode;