diff options
| -rw-r--r-- | linux-core/radeon_ms_drv.c | 1 | ||||
| -rw-r--r-- | shared-core/radeon_ms_drm.c | 15 | ||||
| -rw-r--r-- | shared-core/radeon_ms_exec.c | 2 |
3 files changed, 16 insertions, 2 deletions
diff --git a/linux-core/radeon_ms_drv.c b/linux-core/radeon_ms_drv.c index cf9699f4..fc3c106a 100644 --- a/linux-core/radeon_ms_drv.c +++ b/linux-core/radeon_ms_drv.c @@ -132,6 +132,7 @@ static void __exit radeon_ms_driver_exit(void) static int __init radeon_ms_driver_init(void) { driver.num_ioctls = radeon_ms_num_ioctls; + driver.driver_features |= DRIVER_MODESET; return drm_init(&driver, pciidlist); } 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]); |