diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-05-02 19:10:40 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-05-02 19:10:40 +0100 |
| commit | 47a56c579f88f1eff1d5862237c7bb56aeb50289 (patch) | |
| tree | c195dcf6d6f9fb18816490a3d5fbef7cecc7b577 | |
| parent | 31b2a20bcacbe00285b96f2d824fe6092765ae08 (diff) | |
Reorder startup of engines
This just moves the engine enabling calls around a bit.
Signed-off-by: Thomas White <taw@bitwiz.org.uk>
| -rw-r--r-- | drivers/mfd/glamo/glamo-cmdq.c | 5 | ||||
| -rw-r--r-- | drivers/mfd/glamo/glamo-drm-drv.c | 11 |
2 files changed, 5 insertions, 11 deletions
diff --git a/drivers/mfd/glamo/glamo-cmdq.c b/drivers/mfd/glamo/glamo-cmdq.c index 5742ddedf30..3f1db1aae51 100644 --- a/drivers/mfd/glamo/glamo-cmdq.c +++ b/drivers/mfd/glamo/glamo-cmdq.c @@ -255,11 +255,16 @@ int glamo_cmdq_init(struct glamodrm_handle *gdrm) { unsigned int i; + /* Enable 2D and 3D */ + glamo_engine_enable(gdrm->glamo_core, GLAMO_ENGINE_2D); + glamo_engine_reset(gdrm->glamo_core, GLAMO_ENGINE_2D); + /* Start by zeroing the command queue memory */ for ( i=0; i<GLAMO_CMDQ_SIZE; i+=2 ) { iowrite16(0x0000, gdrm->cmdq_base+i); } + glamo_engine_enable(gdrm->glamo_core, GLAMO_ENGINE_CMDQ); glamo_engine_reset(gdrm->glamo_core, GLAMO_ENGINE_CMDQ); /* Set up command queue location */ diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c index 2c8b5b31445..cadf0545065 100644 --- a/drivers/mfd/glamo/glamo-drm-drv.c +++ b/drivers/mfd/glamo/glamo-drm-drv.c @@ -293,17 +293,6 @@ static int glamodrm_probe(struct platform_device *pdev) /* Initialise DRM */ drm_platform_init(&glamodrm_drm_driver, pdev, (void *)gdrm); - /* Enable 2D and 3D */ - glamo_engine_enable(gdrm->glamo_core, GLAMO_ENGINE_3D); - glamo_engine_reset(gdrm->glamo_core, GLAMO_ENGINE_3D); - msleep(5); - glamo_engine_enable(gdrm->glamo_core, GLAMO_ENGINE_2D); - glamo_engine_reset(gdrm->glamo_core, GLAMO_ENGINE_2D); - msleep(5); - glamo_engine_enable(gdrm->glamo_core, GLAMO_ENGINE_CMDQ); - glamo_engine_reset(gdrm->glamo_core, GLAMO_ENGINE_CMDQ); - msleep(5); - glamo_cmdq_init(gdrm); return 0; |