summaryrefslogtreecommitdiff
path: root/shared-core
AgeCommit message (Expand)Author
2005-06-27Check for 2.6.12 suspend/resume changes (pm_message_t)Alan Hourihane
2005-06-27Check dev_privAlan Hourihane
2005-06-27Save state of registers for suspend/resume.Alan Hourihane
2005-06-24Fix suspend problem when i915 private hasn't been initialized yet.Alan Hourihane
2005-06-21Change initialization of savage register access to _DRM_READ_ONLY. Flags ofJon Smirl
2005-06-20Change initialization of radeon register access to _DRM_READ_ONLY. Flags ofJon Smirl
2005-06-19Remove I2C support from radeon driver. Same support is available fromJon Smirl
2005-06-17fix up drm_alloc_agp to take a dev arg and not pass crappy agpgart aroundDave Airlie
2005-06-14Adds support for PCI cards to MGA DRMIan Romanick
2005-06-11fix up drm.h for C++ include as this can be included in user programsDave Airlie
2005-06-10add dragonfly #define from Xorg CVSDave Airlie
2005-06-09Completely re-initialize DMA settingsIan Romanick
2005-06-06fix some issues with radeon interrupt handlingDave Airlie
2005-06-06Fix copyrightsAlan Hourihane
2005-06-04Remove warnings about code mixed with declerations..Dave Airlie
2005-06-03Minor clean-ups. The drm_mga_fullscreen_t stuff has been dead for a looongIan Romanick
2005-06-03Move the deallocation of dev_private. Since dev_private is allocated whenIan Romanick
2005-05-28Re-implement the power management.Alan Hourihane
2005-05-27Modify drm_driver::device_is_agp to return a tri-state value to indicateIan Romanick
2005-05-27add radeon registers from VHA code these are the "unknown" registersDave Airlie
2005-05-23VIA:Thomas Hellstrom
2005-05-22Refactor the routines for "calculating" the size of the WARP microcode. TheIan Romanick
2005-05-21Forgot to bump the patchlevel and driver date on last commit.Ian Romanick
2005-05-21Change the MGA initialization and cleanup a bit. The dev_private structureIan Romanick
2005-05-18Add i945G pci ids to drmDave Airlie
2005-05-16Added device_is_agp callback to drm_driver. This function is called by theIan Romanick
2005-05-15wrap config.h include with defined for KERNELDave Airlie
2005-05-08VIA: Fix for oops when AGP ring-buffer initialization is called and thereThomas Hellstrom
2005-04-26Clean up some const qualifier cast warnings.Eric Anholt
2005-04-26Convert BSD code to mostly use bus_dma, the dma abstraction for dealingEric Anholt
2005-04-26Use msleep instead of tsleep to drop the DRM device lock and avoid aEric Anholt
2005-04-20VIA: Interrupt handler bugfixes. Bumped patchlevel to 2.6.2.Thomas Hellstrom
2005-04-18VIA:Thomas Hellstrom
2005-03-29Missing file via_video.c commited.Thomas Hellstrom
2005-03-29Add skeletal imagine driver (but don't build it yet).Adam Jackson
2005-03-28Via updates:Thomas Hellstrom
2005-03-25Don't know who set the i915GM PCI ID incorrectly but it should be 0x2592Alan Hourihane
2005-03-25From Xorg CVS realign the i915_drv.hDave Airlie
2005-03-18Add support for production version of ATI RN50/ES1000. (ATI TechnologiesMichel Daenzer
2005-03-15add R200_EMIT_PP_TRI_PERF_CNTL packet to support brilinear filtering onRoland Scheidegger
2005-03-14via changes:Thomas Hellstrom
2005-03-13Command DMA optimizations:Felix Kuehling
2005-03-07Tracked down random lockups related to command DMA that occurred in Quake3Felix Kuehling
2005-03-07minor pointer cast typoDave Airlie
2005-03-06Added support for command DMA on Savage4-based hardware. UnfortunatelyFelix Kuehling
2005-03-04add some idct type 3 packets for referenceDave Airlie
2005-02-23Use wrap counter to extend 16-bit hardware event tags to 32-bit logicalFelix Kuehling
2005-02-20Fix VIA K8M800 PCI ID.Thomas Hellstrom
2005-02-19Fix a couple of gcc warnings in DRM_INFOs.Eric Anholt
2005-02-18fd.o bug #2576: Add support for ATI RN50/ES1000. (ATI Technologies Inc.)Michel Daenzer
s="hl pps">"drmP.h" /** * Allocate drawable ID and memory to store information about it. */ int drm_adddraw(DRM_IOCTL_ARGS) { DRM_DEVICE; unsigned long irqflags; int i, j; u32 *bitfield = dev->drw_bitfield; unsigned int bitfield_length = dev->drw_bitfield_length; drm_drawable_info_t **info = dev->drw_info; unsigned int info_length = dev->drw_info_length; drm_draw_t draw; for (i = 0, j = 0; i < bitfield_length; i++) { if (bitfield[i] == ~0) continue; for (; j < 8 * sizeof(*bitfield); j++) if (!(bitfield[i] & (1 << j))) goto done; } done: if (i == bitfield_length) { bitfield_length++; bitfield = drm_alloc(bitfield_length * sizeof(*bitfield), DRM_MEM_BUFS); if (!bitfield) { DRM_ERROR("Failed to allocate new drawable bitfield\n"); return DRM_ERR(ENOMEM); } if (8 * sizeof(*bitfield) * bitfield_length > info_length) { info_length += 8 * sizeof(*bitfield); info = drm_alloc(info_length * sizeof(*info), DRM_MEM_BUFS); if (!info) { DRM_ERROR("Failed to allocate new drawable info" " array\n"); drm_free(bitfield, bitfield_length * sizeof(*bitfield), DRM_MEM_BUFS); return DRM_ERR(ENOMEM); } } bitfield[i] = 0; } draw.handle = i * 8 * sizeof(*bitfield) + j + 1; DRM_DEBUG("%d\n", draw.handle); spin_lock_irqsave(&dev->drw_lock, irqflags); bitfield[i] |= 1 << j; info[draw.handle - 1] = NULL; if (bitfield != dev->drw_bitfield) { memcpy(bitfield, dev->drw_bitfield, dev->drw_bitfield_length * sizeof(*bitfield)); drm_free(dev->drw_bitfield, sizeof(*bitfield) * dev->drw_bitfield_length, DRM_MEM_BUFS); dev->drw_bitfield = bitfield; dev->drw_bitfield_length = bitfield_length; } if (info != dev->drw_info) { memcpy(info, dev->drw_info, dev->drw_info_length * sizeof(*info)); drm_free(dev->drw_info, sizeof(*info) * dev->drw_info_length, DRM_MEM_BUFS); dev->drw_info = info; dev->drw_info_length = info_length; } spin_unlock_irqrestore(&dev->drw_lock, irqflags); DRM_COPY_TO_USER_IOCTL((drm_draw_t __user *)data, draw, sizeof(draw)); return 0; } /** * Free drawable ID and memory to store information about it. */ int drm_rmdraw(DRM_IOCTL_ARGS) { DRM_DEVICE; drm_draw_t draw; int id, idx; unsigned int shift; unsigned long irqflags; u32 *bitfield = dev->drw_bitfield; unsigned int bitfield_length = dev->drw_bitfield_length; drm_drawable_info_t **info = dev->drw_info; unsigned int info_length = dev->drw_info_length; DRM_COPY_FROM_USER_IOCTL(draw, (drm_draw_t __user *) data, sizeof(draw)); id = draw.handle - 1; idx = id / (8 * sizeof(*bitfield)); shift = id % (8 * sizeof(*bitfield)); if (idx < 0 || idx >= bitfield_length || !(bitfield[idx] & (1 << shift))) { DRM_DEBUG("No such drawable %d\n", draw.handle); return 0; } spin_lock_irqsave(&dev->drw_lock, irqflags); bitfield[idx] &= ~(1 << shift); spin_unlock_irqrestore(&dev->drw_lock, irqflags); if (info[id]) { drm_free(info[id]->rects, info[id]->num_rects * sizeof(drm_clip_rect_t), DRM_MEM_BUFS); drm_free(info[id], sizeof(**info), DRM_MEM_BUFS); } /* Can we shrink the arrays? */ if (idx == bitfield_length - 1) { while (idx >= 0 && !bitfield[idx]) --idx; bitfield_length = idx + 1; if (idx != id / (8 * sizeof(*bitfield))) bitfield = drm_alloc(bitfield_length * sizeof(*bitfield), DRM_MEM_BUFS); if (!bitfield && bitfield_length) { bitfield = dev->drw_bitfield; bitfield_length = dev->drw_bitfield_length; } } if (bitfield != dev->drw_bitfield) { info_length = 8 * sizeof(*bitfield) * bitfield_length; info = drm_alloc(info_length * sizeof(*info), DRM_MEM_BUFS); if (!info && info_length) { info = dev->drw_info; info_length = dev->drw_info_length; } spin_lock_irqsave(&dev->drw_lock, irqflags); memcpy(bitfield, dev->drw_bitfield, bitfield_length * sizeof(*bitfield)); drm_free(dev->drw_bitfield, sizeof(*bitfield) * dev->drw_bitfield_length, DRM_MEM_BUFS); dev->drw_bitfield = bitfield; dev->drw_bitfield_length = bitfield_length; if (info != dev->drw_info) { memcpy(info, dev->drw_info, info_length * sizeof(*info)); drm_free(dev->drw_info, sizeof(*info) * dev->drw_info_length, DRM_MEM_BUFS); dev->drw_info = info; dev->drw_info_length = info_length; } spin_unlock_irqrestore(&dev->drw_lock, irqflags); } DRM_DEBUG("%d\n", draw.handle); return 0; } int drm_update_drawable_info(DRM_IOCTL_ARGS) { DRM_DEVICE; drm_update_draw_t update; unsigned int id, idx, shift, bitfield_length = dev->drw_bitfield_length; u32 *bitfield = dev->drw_bitfield; unsigned long irqflags; drm_drawable_info_t *info; drm_clip_rect_t *rects; int err; DRM_COPY_FROM_USER_IOCTL(update, (drm_update_draw_t __user *) data, sizeof(update)); id = update.handle - 1; idx = id / (8 * sizeof(*bitfield)); shift = id % (8 * sizeof(*bitfield)); if (idx < 0 || idx >= bitfield_length || !(bitfield[idx] & (1 << shift))) { DRM_ERROR("No such drawable %d\n", update.handle); return DRM_ERR(EINVAL); } info = dev->drw_info[id]; if (!info) { info = drm_calloc(1, sizeof(drm_drawable_info_t), DRM_MEM_BUFS); if (!info) { DRM_ERROR("Failed to allocate drawable info memory\n"); return DRM_ERR(ENOMEM); } } switch (update.type) { case DRM_DRAWABLE_CLIPRECTS: if (update.num != info->num_rects) { rects = drm_alloc(update.num * sizeof(drm_clip_rect_t), DRM_MEM_BUFS); } else rects = info->rects; if (update.num && !rects) { DRM_ERROR("Failed to allocate cliprect memory\n"); err = DRM_ERR(ENOMEM); goto error; } if (update.num && DRM_COPY_FROM_USER(rects, (drm_clip_rect_t __user *) (unsigned long)update.data, update.num * sizeof(*rects))) { DRM_ERROR("Failed to copy cliprects from userspace\n"); err = DRM_ERR(EFAULT); goto error; } spin_lock_irqsave(&dev->drw_lock, irqflags); if (rects != info->rects) { drm_free(info->rects, info->num_rects * sizeof(drm_clip_rect_t), DRM_MEM_BUFS); } info->rects = rects; info->num_rects = update.num; dev->drw_info[id] = info; spin_unlock_irqrestore(&dev->drw_lock, irqflags); DRM_DEBUG("Updated %d cliprects for drawable %d\n", info->num_rects, id); break; default: DRM_ERROR("Invalid update type %d\n", update.type); return DRM_ERR(EINVAL); } return 0; error: if (!dev->drw_info[id]) drm_free(info, sizeof(*info), DRM_MEM_BUFS); else if (rects != dev->drw_info[id]->rects) drm_free(rects, update.num * sizeof(drm_clip_rect_t), DRM_MEM_BUFS); return err; } /** * Caller must hold the drawable spinlock! */ drm_drawable_info_t *drm_get_drawable_info(drm_device_t *dev, drm_drawable_t id) { u32 *bitfield = dev->drw_bitfield; unsigned int idx, shift; id--; idx = id / (8 * sizeof(*bitfield)); shift = id % (8 * sizeof(*bitfield)); if (idx < 0 || idx >= dev->drw_bitfield_length || !(bitfield[idx] & (1 << shift))) { DRM_DEBUG("No such drawable %d\n", id); return NULL; } return dev->drw_info[id]; } EXPORT_SYMBOL(drm_get_drawable_info);