Commit ae6f4a8b authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: add idr_init to drm_stub.c
  drm: fix problem with SiS typedef with sisfb enabled.
parents a5fcaa21 45ea5dcd
...@@ -72,6 +72,8 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, ...@@ -72,6 +72,8 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
mutex_init(&dev->struct_mutex); mutex_init(&dev->struct_mutex);
mutex_init(&dev->ctxlist_mutex); mutex_init(&dev->ctxlist_mutex);
idr_init(&dev->drw_idr);
dev->pdev = pdev; dev->pdev = pdev;
dev->pci_device = pdev->device; dev->pci_device = pdev->device;
dev->pci_vendor = pdev->vendor; dev->pci_vendor = pdev->vendor;
......
...@@ -94,7 +94,7 @@ static int sis_fb_init(DRM_IOCTL_ARGS) ...@@ -94,7 +94,7 @@ static int sis_fb_init(DRM_IOCTL_ARGS)
mutex_lock(&dev->struct_mutex); mutex_lock(&dev->struct_mutex);
#if defined(CONFIG_FB_SIS) #if defined(CONFIG_FB_SIS)
{ {
drm_sman_mm_t sman_mm; struct drm_sman_mm sman_mm;
sman_mm.private = (void *)0xFFFFFFFF; sman_mm.private = (void *)0xFFFFFFFF;
sman_mm.allocate = sis_sman_mm_allocate; sman_mm.allocate = sis_sman_mm_allocate;
sman_mm.free = sis_sman_mm_free; sman_mm.free = sis_sman_mm_free;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment