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

Commit a65c8bda authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: don't use dss bus in suspend/resume 



We have support functions to suspend and resume all the displays that
are used with system suspend. These functions use the dss bus to iterate
the display devices.

As we aim to remove the custom dss bus totally, this patch removes the
explicit use of dss bus from these functions. Instead the
for_each_dss_dev() macro is used to go through the devices.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 67b23ca1

drivers/video/omap2/dss/display.c

+28 −49
Original line number Diff line number Diff line
@@ -76,74 +76,53 @@ void omapdss_default_get_timings(struct omap_dss_device *dssdev, 
}

EXPORT_SYMBOL(omapdss_default_get_timings);



static int dss_suspend_device(struct device *dev, void *data)

int dss_suspend_all_devices(void)

{

	struct omap_dss_device *dssdev = to_dss_device(dev);

	struct omap_dss_device *dssdev = NULL;



	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) {

		dssdev->activate_after_resume = false;

		return 0;

	}

	for_each_dss_dev(dssdev) {

		if (!dssdev->driver)

			continue;



		if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {

			dssdev->driver->disable(dssdev);



			dssdev->activate_after_resume = true;



	return 0;

		} else {

			dssdev->activate_after_resume = false;

		}



int dss_suspend_all_devices(void)

{

	int r;

	struct bus_type *bus = dss_get_bus();



	r = bus_for_each_dev(bus, NULL, NULL, dss_suspend_device);

	if (r) {

		/* resume all displays that were suspended */

		dss_resume_all_devices();

		return r;

	}



	return 0;

}



static int dss_resume_device(struct device *dev, void *data)

int dss_resume_all_devices(void)

{

	int r;

	struct omap_dss_device *dssdev = to_dss_device(dev);

	struct omap_dss_device *dssdev = NULL;



	if (dssdev->activate_after_resume) {

		r = dssdev->driver->enable(dssdev);

		if (r)

			return r;

	}

	for_each_dss_dev(dssdev) {

		if (!dssdev->driver)

			continue;



		if (dssdev->activate_after_resume) {

			dssdev->driver->enable(dssdev);

			dssdev->activate_after_resume = false;

		}

	}



	return 0;

}



int dss_resume_all_devices(void)

void dss_disable_all_devices(void)

{

	struct bus_type *bus = dss_get_bus();



	return bus_for_each_dev(bus, NULL, NULL, dss_resume_device);

}

	struct omap_dss_device *dssdev = NULL;



static int dss_disable_device(struct device *dev, void *data)

{

	struct omap_dss_device *dssdev = to_dss_device(dev);

	for_each_dss_dev(dssdev) {

		if (!dssdev->driver)

			continue;



	if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED)

		if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)

			dssdev->driver->disable(dssdev);



	return 0;

	}



void dss_disable_all_devices(void)

{

	struct bus_type *bus = dss_get_bus();

	bus_for_each_dev(bus, NULL, NULL, dss_disable_device);

}



static LIST_HEAD(panel_list);