diff options
| author | Jerome Glisse <glisse@freedesktop.org> | 2008-03-27 20:08:37 +0100 |
|---|---|---|
| committer | John Doe <glisse@freedesktop.org> | 2008-03-27 20:08:37 +0100 |
| commit | 0da289bafd2da72a14f3d5cf82fec836d30f7b8d (patch) | |
| tree | f9a83d2fd81b6e47e434b5d92fca875e000710fe /shared-core | |
| parent | acb6c9ef97df999f3fa87639b1bb4f2840970f71 (diff) | |
radeon_ms: this is a modesetting driver, bring things up to date
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/radeon_ms_drm.c | 15 | ||||
| -rw-r--r-- | shared-core/radeon_ms_exec.c | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/shared-core/radeon_ms_drm.c b/shared-core/radeon_ms_drm.c index 40f5d791..b3fb7e03 100644 --- a/shared-core/radeon_ms_drm.c +++ b/shared-core/radeon_ms_drm.c @@ -155,7 +155,13 @@ int radeon_ms_driver_load(struct drm_device *dev, unsigned long flags) /* init bo driver */ dev_priv->fence_id_last = 1; dev_priv->fence_reg = SCRATCH_REG2; - drm_bo_driver_init(dev); + ret = drm_bo_driver_init(dev); + if (ret != 0) { + DRM_INFO("[radeon_ms] failed to init bo driver %d.\n", ret); + radeon_ms_driver_unload(dev); + return ret; + } + DRM_INFO("[radeon_ms] bo driver succesfull %d.\n", dev->bm.initialized); /* initialize vram */ ret = drm_bo_init_mm(dev, DRM_BO_MEM_VRAM, 0, dev_priv->vram.size, 1); if (ret != 0) { @@ -239,6 +245,13 @@ int radeon_ms_driver_load(struct drm_device *dev, unsigned long flags) return ret; } + if (dev->primary && dev->control) { + DRM_INFO("[radeon_ms] control 0x%lx, render 0x%lx\n", + (long)dev->primary->device, (long)dev->control->device); + } else { + DRM_INFO("[radeon_ms] error control 0x%lx, render 0x%lx\n", + (long)dev->primary, (long)dev->control); + } DRM_INFO("[radeon_ms] successfull initialization\n"); return 0; } diff --git a/shared-core/radeon_ms_exec.c b/shared-core/radeon_ms_exec.c index 8e28b19e..d8f67842 100644 --- a/shared-core/radeon_ms_exec.c +++ b/shared-core/radeon_ms_exec.c @@ -79,10 +79,10 @@ static int radeon_ms_execbuffer_args(struct drm_device *dev, if (args_count >= 1) { ret = drm_bo_handle_validate(file_priv, arg.d.req.bo_req.handle, - arg.d.req.bo_req.fence_class, arg.d.req.bo_req.flags, arg.d.req.bo_req.mask, arg.d.req.bo_req.hint, + arg.d.req.bo_req.fence_class, 0, &rep.bo_info, &buffers[args_count]); |