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

Commit 4571a023 authored by Jani Nikula's avatar Jani Nikula Committed by Tomi Valkeinen
Browse files

OMAP: DSS2: Taal: Change ESD work management 



Move ESD work queuing and cancelling out of taal_power_on/off() to avoid
problems related to taal_esd_work() calling the power on/off functions.

Signed-off-by: default avatarJani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@nokia.com>
parent fed44b7a

drivers/video/omap2/displays/panel-taal.c

+16 −9
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ static void taal_remove(struct omap_dss_device *dssdev) 
	taal_bl_update_status(bldev);

	backlight_device_unregister(bldev);



	cancel_delayed_work_sync(&td->esd_work);

	cancel_delayed_work(&td->esd_work);

	destroy_workqueue(td->esd_wq);



	/* reset, to be sure that the panel is in a valid state */
@@ -725,10 +725,6 @@ static int taal_power_on(struct omap_dss_device *dssdev) 
	if (r)

		goto err;



#ifdef TAAL_USE_ESD_CHECK

	queue_delayed_work(td->esd_wq, &td->esd_work, TAAL_ESD_CHECK_PERIOD);

#endif



	td->enabled = 1;



	if (!td->intro_printed) {
@@ -758,8 +754,6 @@ static void taal_power_off(struct omap_dss_device *dssdev) 
	struct taal_data *td = dev_get_drvdata(&dssdev->dev);

	int r;



	cancel_delayed_work(&td->esd_work);



	r = taal_dcs_write_0(DCS_DISPLAY_OFF);

	if (!r) {

		r = taal_sleep_in(td);
@@ -801,6 +795,10 @@ static int taal_enable(struct omap_dss_device *dssdev) 
	if (r)

		goto err;



#ifdef TAAL_USE_ESD_CHECK

	queue_delayed_work(td->esd_wq, &td->esd_work, TAAL_ESD_CHECK_PERIOD);

#endif



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	mutex_unlock(&td->lock);
@@ -820,6 +818,8 @@ static void taal_disable(struct omap_dss_device *dssdev) 


	mutex_lock(&td->lock);



	cancel_delayed_work(&td->esd_work);



	dsi_bus_lock();



	if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
@@ -846,6 +846,8 @@ static int taal_suspend(struct omap_dss_device *dssdev) 
		goto err;

	}



	cancel_delayed_work(&td->esd_work);



	dsi_bus_lock();



	taal_power_off(dssdev);
@@ -882,10 +884,15 @@ static int taal_resume(struct omap_dss_device *dssdev) 


	dsi_bus_unlock();



	if (r)

	if (r) {

		dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

	else

	} else {

		dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;

#ifdef TAAL_USE_ESD_CHECK

		queue_delayed_work(td->esd_wq, &td->esd_work,

				TAAL_ESD_CHECK_PERIOD);

#endif

	}



	mutex_unlock(&td->lock);