fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2025-12-20 14:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

radeon_ms: this is a modesetting driver, bring things up to date

Browse source
This commit is contained in:
Jerome Glisse 2008-03-27 20:08:37 +01:00 • committed by John Doe
parent acb6c9ef97
commit 0da289bafd
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
linux-core/radeon_ms_drv.c
View file

@ -132,6 +132,7 @@ static void __exit radeon_ms_driver_exit(void)
static int __init radeon_ms_driver_init(void) static int __init radeon_ms_driver_init(void)
{ {
driver.num_ioctls = radeon_ms_num_ioctls; driver.num_ioctls = radeon_ms_num_ioctls;
driver.driver_features |= DRIVER_MODESET;
return drm_init(&driver, pciidlist); return drm_init(&driver, pciidlist);
} }

15
shared-core/radeon_ms_drm.c
View file

@ -155,7 +155,13 @@ int radeon_ms_driver_load(struct drm_device *dev, unsigned long flags)
/* init bo driver */ /* init bo driver */
dev_priv->fence_id_last = 1; dev_priv->fence_id_last = 1;
dev_priv->fence_reg = SCRATCH_REG2; 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 */ /* initialize vram */
ret = drm_bo_init_mm(dev, DRM_BO_MEM_VRAM, 0, dev_priv->vram.size, 1); ret = drm_bo_init_mm(dev, DRM_BO_MEM_VRAM, 0, dev_priv->vram.size, 1);
if (ret != 0) { if (ret != 0) {
@ -239,6 +245,13 @@ int radeon_ms_driver_load(struct drm_device *dev, unsigned long flags)
return ret; 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"); DRM_INFO("[radeon_ms] successfull initialization\n");
return 0; return 0;
} }

2
shared-core/radeon_ms_exec.c
View file

@ -79,10 +79,10 @@ static int radeon_ms_execbuffer_args(struct drm_device *dev,
if (args_count >= 1) { if (args_count >= 1) {
ret = drm_bo_handle_validate(file_priv, ret = drm_bo_handle_validate(file_priv,
arg.d.req.bo_req.handle, arg.d.req.bo_req.handle,
arg.d.req.bo_req.fence_class,
arg.d.req.bo_req.flags, arg.d.req.bo_req.flags,
arg.d.req.bo_req.mask, arg.d.req.bo_req.mask,
arg.d.req.bo_req.hint, arg.d.req.bo_req.hint,
arg.d.req.bo_req.fence_class,
0, 0,
&rep.bo_info, &rep.bo_info,
&buffers[args_count]); &buffers[args_count]);