Commit 63c4cec7 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2019-10-03' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



 - One include fix for tilcdc
 - A clock fix for OMAP
 - A memory leak fix for Komeda
 - Some fixes for resources cleanups with writeback

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191003081031.oykms5fg4tijvdri@gilmour
parents 0f83eb88 b6559bf3

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

+4 −3
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");
@@ -166,8 +165,10 @@ static int komeda_wb_connector_add(struct komeda_kms_dev *kms, 
					   &komeda_wb_encoder_helper_funcs,

					   formats, n_formats);

	komeda_put_fourcc_list(formats);

	if (err)

	if (err) {

		kfree(kwb_conn);

		return err;

	}



	drm_connector_helper_add(&wb_conn->base, &komeda_wb_conn_helper_funcs);

drivers/gpu/drm/arm/malidp_mw.c

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,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;
@@ -248,7 +248,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/drm_writeback.c

+15 −8
Original line number Diff line number Diff line
@@ -324,6 +324,9 @@ void drm_writeback_cleanup_job(struct drm_writeback_job *job) 
	if (job->fb)

		drm_framebuffer_put(job->fb);



	if (job->out_fence)

		dma_fence_put(job->out_fence);



	kfree(job);

}

EXPORT_SYMBOL(drm_writeback_cleanup_job);
@@ -366,25 +369,29 @@ drm_writeback_signal_completion(struct drm_writeback_connector *wb_connector, 
{

	unsigned long flags;

	struct drm_writeback_job *job;

	struct dma_fence *out_fence;



	spin_lock_irqsave(&wb_connector->job_lock, flags);

	job = list_first_entry_or_null(&wb_connector->job_queue,

				       struct drm_writeback_job,

				       list_entry);

	if (job) {

	if (job)

		list_del(&job->list_entry);

		if (job->out_fence) {

			if (status)

				dma_fence_set_error(job->out_fence, status);

			dma_fence_signal(job->out_fence);

			dma_fence_put(job->out_fence);

		}

	}



	spin_unlock_irqrestore(&wb_connector->job_lock, flags);



	if (WARN_ON(!job))

		return;



	out_fence = job->out_fence;

	if (out_fence) {

		if (status)

			dma_fence_set_error(out_fence, status);

		dma_fence_signal(out_fence);

		dma_fence_put(out_fence);

		job->out_fence = NULL;

	}



	INIT_WORK(&job->cleanup_work, cleanup_work);

	queue_work(system_long_wq, &job->cleanup_work);

}

drivers/gpu/drm/omapdrm/dss/dss.c

+1 −1
Original line number Diff line number Diff line
@@ -1083,7 +1083,7 @@ static const struct dss_features omap34xx_dss_feats = { 


static const struct dss_features omap3630_dss_feats = {

	.model			=	DSS_MODEL_OMAP3,

	.fck_div_max		=	32,

	.fck_div_max		=	31,

	.fck_freq_max		=	173000000,

	.dss_fck_multiplier	=	1,

	.parent_clk_name	=	"dpll4_ck",

CRA Git | Maintained and supported by SUSTech CRA and CCSE