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

Commit 2ad14a6c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-vc4-fixes-2015-01-19' of http://github.com/anholt/linux into drm-fixes 

This pull request just includes the !CONFIG_PM_SLEEP build fix for
vc4.

* tag 'drm-vc4-fixes-2015-01-19' of http://github.com/anholt/linux:
  drm/vc4: Remove broken attempt at GPU reset using genpd.
parents 2081e78a 8483d152

drivers/gpu/drm/vc4/vc4_v3d.c

+7 −10
Original line number Diff line number Diff line
@@ -144,19 +144,16 @@ int vc4_v3d_debugfs_ident(struct seq_file *m, void *unused) 
}

#endif /* CONFIG_DEBUG_FS */



/*

 * Asks the firmware to turn on power to the V3D engine.

 *

 * This may be doable with just the clocks interface, though this

 * packet does some other register setup from the firmware, too.

 */

int

vc4_v3d_set_power(struct vc4_dev *vc4, bool on)

{

	if (on)

		return pm_generic_poweroff(&vc4->v3d->pdev->dev);

	else

		return pm_generic_resume(&vc4->v3d->pdev->dev);

	/* XXX: This interface is needed for GPU reset, and the way to

	 * do it is to turn our power domain off and back on.  We

	 * can't just reset from within the driver, because the reset

	 * bits are in the power domain's register area, and get set

	 * during the poweron process.

	 */

	return 0;

}



static void vc4_v3d_init_hw(struct drm_device *dev)