lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: Avoid oops in DRM_IOCTL_RM_DRAW if a bad handle is supplied.
  drm: Add 32-bit compatibility for DRM_IOCTL_UPDATE_DRAW.
  drm/i915: use pipes, not planes to label vblank data
  drm/i915: hold dev->struct_mutex and DRM lock during vblank ring operations
  i915: Fix format string warnings on x86-64.
  i915: Don't dereference HWS in /proc debug files when it isn't initialized.
  i915: Enable IMR passthrough of vblank events before enabling it in pipestat.
  drm: Remove two leaks of vblank reference count in error paths.
  drm: fix leak of cliprects in drm_rmdraw()
  i915: Disable MSI on GM965 (errata says it doesn't work)
  drm: Set cliprects to NULL when changing drawable to having 0 cliprects.
  i915: Protect vblank IRQ reg access with spinlock
This commit is contained in:
Linus Torvalds
2008-10-23 10:18:40 -07:00
parent a3415dc34f 7e78f72524
commit 70740d6c93
9 changed files with 223 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpu/drm/drm_drawable.c
View File

@@ -76,11 +76,18 @@ int drm_rmdraw(struct drm_device *dev, void *data, struct drm_file *file_priv)
{ {
struct drm_draw *draw = data; struct drm_draw *draw = data;
unsigned long irqflags; unsigned long irqflags;
struct drm_drawable_info *info;
spin_lock_irqsave(&dev->drw_lock, irqflags); spin_lock_irqsave(&dev->drw_lock, irqflags);
drm_free(drm_get_drawable_info(dev, draw->handle), info = drm_get_drawable_info(dev, draw->handle);
sizeof(struct drm_drawable_info), DRM_MEM_BUFS); if (info == NULL) {
spin_unlock_irqrestore(&dev->drw_lock, irqflags);
return -EINVAL;
}
drm_free(info->rects, info->num_rects * sizeof(struct drm_clip_rect),
DRM_MEM_BUFS);
drm_free(info, sizeof(struct drm_drawable_info), DRM_MEM_BUFS);
idr_remove(&dev->drw_idr, draw->handle); idr_remove(&dev->drw_idr, draw->handle);
@@ -111,7 +118,9 @@ int drm_update_drawable_info(struct drm_device *dev, void *data, struct drm_file
switch (update->type) { switch (update->type) {
case DRM_DRAWABLE_CLIPRECTS: case DRM_DRAWABLE_CLIPRECTS:
if (update->num != info->num_rects) { if (update->num == 0)
rects = NULL;
else if (update->num != info->num_rects) {
rects = drm_alloc(update->num * sizeof(struct drm_clip_rect), rects = drm_alloc(update->num * sizeof(struct drm_clip_rect),
DRM_MEM_BUFS); DRM_MEM_BUFS);
} else } else

34
drivers/gpu/drm/drm_ioc32.c
View File

@@ -64,6 +64,8 @@
#define DRM_IOCTL_SG_ALLOC32 DRM_IOW( 0x38, drm_scatter_gather32_t) #define DRM_IOCTL_SG_ALLOC32 DRM_IOW( 0x38, drm_scatter_gather32_t)
#define DRM_IOCTL_SG_FREE32 DRM_IOW( 0x39, drm_scatter_gather32_t) #define DRM_IOCTL_SG_FREE32 DRM_IOW( 0x39, drm_scatter_gather32_t)
#define DRM_IOCTL_UPDATE_DRAW32 DRM_IOW( 0x3f, drm_update_draw32_t)
#define DRM_IOCTL_WAIT_VBLANK32 DRM_IOWR(0x3a, drm_wait_vblank32_t) #define DRM_IOCTL_WAIT_VBLANK32 DRM_IOWR(0x3a, drm_wait_vblank32_t)
typedef struct drm_version_32 { typedef struct drm_version_32 {
@@ -952,6 +954,37 @@ static int compat_drm_sg_free(struct file *file, unsigned int cmd,
DRM_IOCTL_SG_FREE, (unsigned long)request); DRM_IOCTL_SG_FREE, (unsigned long)request);
} }
typedef struct drm_update_draw32 {
drm_drawable_t handle;
unsigned int type;
unsigned int num;
/* 64-bit version has a 32-bit pad here */
u64 data; /**< Pointer */
} __attribute__((packed)) drm_update_draw32_t;
static int compat_drm_update_draw(struct file *file, unsigned int cmd,
unsigned long arg)
{
drm_update_draw32_t update32;
struct drm_update_draw __user *request;
int err;
if (copy_from_user(&update32, (void __user *)arg, sizeof(update32)))
return -EFAULT;
request = compat_alloc_user_space(sizeof(*request));
if (!access_ok(VERIFY_WRITE, request, sizeof(*request)) ||
__put_user(update32.handle, &request->handle) ||
__put_user(update32.type, &request->type) ||
__put_user(update32.num, &request->num) ||
__put_user(update32.data, &request->data))
return -EFAULT;
err = drm_ioctl(file->f_path.dentry->d_inode, file,
DRM_IOCTL_UPDATE_DRAW, (unsigned long)request);
return err;
}
struct drm_wait_vblank_request32 { struct drm_wait_vblank_request32 {
enum drm_vblank_seq_type type; enum drm_vblank_seq_type type;
unsigned int sequence; unsigned int sequence;
@@ -1033,6 +1066,7 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
#endif #endif
[DRM_IOCTL_NR(DRM_IOCTL_SG_ALLOC32)] = compat_drm_sg_alloc, [DRM_IOCTL_NR(DRM_IOCTL_SG_ALLOC32)] = compat_drm_sg_alloc,
[DRM_IOCTL_NR(DRM_IOCTL_SG_FREE32)] = compat_drm_sg_free, [DRM_IOCTL_NR(DRM_IOCTL_SG_FREE32)] = compat_drm_sg_free,
[DRM_IOCTL_NR(DRM_IOCTL_UPDATE_DRAW32)] = compat_drm_update_draw,
[DRM_IOCTL_NR(DRM_IOCTL_WAIT_VBLANK32)] = compat_drm_wait_vblank, [DRM_IOCTL_NR(DRM_IOCTL_WAIT_VBLANK32)] = compat_drm_wait_vblank,
}; };

5
drivers/gpu/drm/drm_irq.c
View File

@@ -594,11 +594,14 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
goto done; goto done;
} }
/* Get a refcount on the vblank, which will be released by
* drm_vbl_send_signals().
*/
ret = drm_vblank_get(dev, crtc); ret = drm_vblank_get(dev, crtc);
if (ret) { if (ret) {
drm_free(vbl_sig, sizeof(struct drm_vbl_sig), drm_free(vbl_sig, sizeof(struct drm_vbl_sig),
DRM_MEM_DRIVER); DRM_MEM_DRIVER);
return ret; goto done;
} }
atomic_inc(&dev->vbl_signal_pending); atomic_inc(&dev->vbl_signal_pending);

2
drivers/gpu/drm/drm_lock.c
View File

@@ -232,6 +232,7 @@ int drm_lock_take(struct drm_lock_data *lock_data,
} }
return 0; return 0;
} }
EXPORT_SYMBOL(drm_lock_take);
/** /**
* This takes a lock forcibly and hands it to context. Should ONLY be used * This takes a lock forcibly and hands it to context. Should ONLY be used
@@ -299,6 +300,7 @@ int drm_lock_free(struct drm_lock_data *lock_data, unsigned int context)
wake_up_interruptible(&lock_data->lock_queue); wake_up_interruptible(&lock_data->lock_queue);
return 0; return 0;
} }
EXPORT_SYMBOL(drm_lock_free);
/** /**
* If we get here, it means that the process has called DRM_IOCTL_LOCK * If we get here, it means that the process has called DRM_IOCTL_LOCK

5
drivers/gpu/drm/i915/i915_dma.c
View File

@@ -844,8 +844,11 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
* correctly in testing on 945G. * correctly in testing on 945G.
* This may be a side effect of MSI having been made available for PEG * This may be a side effect of MSI having been made available for PEG
* and the registers being closely associated. * and the registers being closely associated.
*
* According to chipset errata, on the 965GM, MSI interrupts may
* be lost or delayed
*/ */
if (!IS_I945G(dev) && !IS_I945GM(dev)) if (!IS_I945G(dev) && !IS_I945GM(dev) && !IS_I965GM(dev))
if (pci_enable_msi(dev->pdev)) if (pci_enable_msi(dev->pdev))
DRM_ERROR("failed to enable MSI\n"); DRM_ERROR("failed to enable MSI\n");

10
drivers/gpu/drm/i915/i915_drv.h
View File

@@ -90,7 +90,7 @@ struct mem_block {
typedef struct _drm_i915_vbl_swap { typedef struct _drm_i915_vbl_swap {
struct list_head head; struct list_head head;
drm_drawable_t drw_id; drm_drawable_t drw_id;
unsigned int plane; unsigned int pipe;
unsigned int sequence; unsigned int sequence;
} drm_i915_vbl_swap_t; } drm_i915_vbl_swap_t;
@@ -240,6 +240,9 @@ typedef struct drm_i915_private {
u8 saveDACDATA[256*3]; /* 256 3-byte colors */ u8 saveDACDATA[256*3]; /* 256 3-byte colors */
u8 saveCR[37]; u8 saveCR[37];
/** Work task for vblank-related ring access */
struct work_struct vblank_work;
struct { struct {
struct drm_mm gtt_space; struct drm_mm gtt_space;
@@ -285,9 +288,6 @@ typedef struct drm_i915_private {
*/ */
struct delayed_work retire_work; struct delayed_work retire_work;
/** Work task for vblank-related ring access */
struct work_struct vblank_work;
uint32_t next_gem_seqno; uint32_t next_gem_seqno;
/** /**
@@ -441,7 +441,7 @@ extern int i915_irq_wait(struct drm_device *dev, void *data,
void i915_user_irq_get(struct drm_device *dev); void i915_user_irq_get(struct drm_device *dev);
void i915_user_irq_put(struct drm_device *dev); void i915_user_irq_put(struct drm_device *dev);
extern void i915_gem_vblank_work_handler(struct work_struct *work); extern void i915_vblank_work_handler(struct work_struct *work);
extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS); extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS);
extern void i915_driver_irq_preinstall(struct drm_device * dev); extern void i915_driver_irq_preinstall(struct drm_device * dev);
extern int i915_driver_irq_postinstall(struct drm_device *dev); extern int i915_driver_irq_postinstall(struct drm_device *dev);

2
drivers/gpu/drm/i915/i915_gem.c
View File

@@ -2564,8 +2564,6 @@ i915_gem_load(struct drm_device *dev)
INIT_LIST_HEAD(&dev_priv->mm.request_list); INIT_LIST_HEAD(&dev_priv->mm.request_list);
INIT_DELAYED_WORK(&dev_priv->mm.retire_work, INIT_DELAYED_WORK(&dev_priv->mm.retire_work,
i915_gem_retire_work_handler); i915_gem_retire_work_handler);
INIT_WORK(&dev_priv->mm.vblank_work,
i915_gem_vblank_work_handler);
dev_priv->mm.next_gem_seqno = 1; dev_priv->mm.next_gem_seqno = 1;
i915_gem_detect_bit_6_swizzle(dev); i915_gem_detect_bit_6_swizzle(dev);

11
drivers/gpu/drm/i915/i915_gem_proc.c
View File

@@ -192,7 +192,12 @@ static int i915_gem_seqno_info(char *buf, char **start, off_t offset,
*start = &buf[offset]; *start = &buf[offset];
*eof = 0; *eof = 0;
DRM_PROC_PRINT("Current sequence: %d\n", i915_get_gem_seqno(dev)); if (dev_priv->hw_status_page != NULL) {
DRM_PROC_PRINT("Current sequence: %d\n",
i915_get_gem_seqno(dev));
} else {
DRM_PROC_PRINT("Current sequence: hws uninitialized\n");
}
DRM_PROC_PRINT("Waiter sequence: %d\n", DRM_PROC_PRINT("Waiter sequence: %d\n",
dev_priv->mm.waiting_gem_seqno); dev_priv->mm.waiting_gem_seqno);
DRM_PROC_PRINT("IRQ sequence: %d\n", dev_priv->mm.irq_gem_seqno); DRM_PROC_PRINT("IRQ sequence: %d\n", dev_priv->mm.irq_gem_seqno);
@@ -230,8 +235,12 @@ static int i915_interrupt_info(char *buf, char **start, off_t offset,
I915_READ(PIPEBSTAT)); I915_READ(PIPEBSTAT));
DRM_PROC_PRINT("Interrupts received: %d\n", DRM_PROC_PRINT("Interrupts received: %d\n",
atomic_read(&dev_priv->irq_received)); atomic_read(&dev_priv->irq_received));
if (dev_priv->hw_status_page != NULL) {
DRM_PROC_PRINT("Current sequence: %d\n", DRM_PROC_PRINT("Current sequence: %d\n",
i915_get_gem_seqno(dev)); i915_get_gem_seqno(dev));
} else {
DRM_PROC_PRINT("Current sequence: hws uninitialized\n");
}
DRM_PROC_PRINT("Waiter sequence: %d\n", DRM_PROC_PRINT("Waiter sequence: %d\n",
dev_priv->mm.waiting_gem_seqno); dev_priv->mm.waiting_gem_seqno);
DRM_PROC_PRINT("IRQ sequence: %d\n", DRM_PROC_PRINT("IRQ sequence: %d\n",

251
drivers/gpu/drm/i915/i915_irq.c
View File

@@ -59,43 +59,6 @@ i915_disable_irq(drm_i915_private_t *dev_priv, u32 mask)
} }
} }
/**
* i915_get_pipe - return the the pipe associated with a given plane
* @dev: DRM device
* @plane: plane to look for
*
* The Intel Mesa & 2D drivers call the vblank routines with a plane number
* rather than a pipe number, since they may not always be equal. This routine
* maps the given @plane back to a pipe number.
*/
static int
i915_get_pipe(struct drm_device *dev, int plane)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
u32 dspcntr;
dspcntr = plane ? I915_READ(DSPBCNTR) : I915_READ(DSPACNTR);
return dspcntr & DISPPLANE_SEL_PIPE_MASK ? 1 : 0;
}
/**
* i915_get_plane - return the the plane associated with a given pipe
* @dev: DRM device
* @pipe: pipe to look for
*
* The Intel Mesa & 2D drivers call the vblank routines with a plane number
* rather than a plane number, since they may not always be equal. This routine
* maps the given @pipe back to a plane number.
*/
static int
i915_get_plane(struct drm_device *dev, int pipe)
{
if (i915_get_pipe(dev, 0) == pipe)
return 0;
return 1;
}
/** /**
* i915_pipe_enabled - check if a pipe is enabled * i915_pipe_enabled - check if a pipe is enabled
* @dev: DRM device * @dev: DRM device
@@ -121,6 +84,9 @@ i915_pipe_enabled(struct drm_device *dev, int pipe)
* Emit blits for scheduled buffer swaps. * Emit blits for scheduled buffer swaps.
* *
* This function will be called with the HW lock held. * This function will be called with the HW lock held.
* Because this function must grab the ring mutex (dev->struct_mutex),
* it can no longer run at soft irq time. We'll fix this when we do
* the DRI2 swap buffer work.
*/ */
static void i915_vblank_tasklet(struct drm_device *dev) static void i915_vblank_tasklet(struct drm_device *dev)
{ {
@@ -141,6 +107,8 @@ static void i915_vblank_tasklet(struct drm_device *dev)
u32 ropcpp = (0xcc << 16) | ((cpp - 1) << 24); u32 ropcpp = (0xcc << 16) | ((cpp - 1) << 24);
RING_LOCALS; RING_LOCALS;
mutex_lock(&dev->struct_mutex);
if (IS_I965G(dev) && sarea_priv->front_tiled) { if (IS_I965G(dev) && sarea_priv->front_tiled) {
cmd |= XY_SRC_COPY_BLT_DST_TILED; cmd |= XY_SRC_COPY_BLT_DST_TILED;
dst_pitch >>= 2; dst_pitch >>= 2;
@@ -165,7 +133,7 @@ static void i915_vblank_tasklet(struct drm_device *dev)
list_for_each_safe(list, tmp, &dev_priv->vbl_swaps.head) { list_for_each_safe(list, tmp, &dev_priv->vbl_swaps.head) {
drm_i915_vbl_swap_t *vbl_swap = drm_i915_vbl_swap_t *vbl_swap =
list_entry(list, drm_i915_vbl_swap_t, head); list_entry(list, drm_i915_vbl_swap_t, head);
int pipe = i915_get_pipe(dev, vbl_swap->plane); int pipe = vbl_swap->pipe;
if ((counter[pipe] - vbl_swap->sequence) > (1<<23)) if ((counter[pipe] - vbl_swap->sequence) > (1<<23))
continue; continue;
@@ -179,20 +147,19 @@ static void i915_vblank_tasklet(struct drm_device *dev)
drw = drm_get_drawable_info(dev, vbl_swap->drw_id); drw = drm_get_drawable_info(dev, vbl_swap->drw_id);
if (!drw) {
spin_unlock(&dev->drw_lock);
drm_free(vbl_swap, sizeof(*vbl_swap), DRM_MEM_DRIVER);
spin_lock(&dev_priv->swaps_lock);
continue;
}
list_for_each(hit, &hits) { list_for_each(hit, &hits) {
drm_i915_vbl_swap_t *swap_cmp = drm_i915_vbl_swap_t *swap_cmp =
list_entry(hit, drm_i915_vbl_swap_t, head); list_entry(hit, drm_i915_vbl_swap_t, head);
struct drm_drawable_info *drw_cmp = struct drm_drawable_info *drw_cmp =
drm_get_drawable_info(dev, swap_cmp->drw_id); drm_get_drawable_info(dev, swap_cmp->drw_id);
if (drw_cmp && /* Make sure both drawables are still
* around and have some rectangles before
* we look inside to order them for the
* blts below.
*/
if (drw_cmp && drw_cmp->num_rects > 0 &&
drw && drw->num_rects > 0 &&
drw_cmp->rects[0].y1 > drw->rects[0].y1) { drw_cmp->rects[0].y1 > drw->rects[0].y1) {
list_add_tail(list, hit); list_add_tail(list, hit);
break; break;
@@ -212,6 +179,7 @@ static void i915_vblank_tasklet(struct drm_device *dev)
if (nhits == 0) { if (nhits == 0) {
spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags); spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
mutex_unlock(&dev->struct_mutex);
return; return;
} }
@@ -265,18 +233,21 @@ static void i915_vblank_tasklet(struct drm_device *dev)
drm_i915_vbl_swap_t *swap_hit = drm_i915_vbl_swap_t *swap_hit =
list_entry(hit, drm_i915_vbl_swap_t, head); list_entry(hit, drm_i915_vbl_swap_t, head);
struct drm_clip_rect *rect; struct drm_clip_rect *rect;
int num_rects, plane; int num_rects, pipe;
unsigned short top, bottom; unsigned short top, bottom;
drw = drm_get_drawable_info(dev, swap_hit->drw_id); drw = drm_get_drawable_info(dev, swap_hit->drw_id);
/* The drawable may have been destroyed since
* the vblank swap was queued
*/
if (!drw) if (!drw)
continue; continue;
rect = drw->rects; rect = drw->rects;
plane = swap_hit->plane; pipe = swap_hit->pipe;
top = upper[plane]; top = upper[pipe];
bottom = lower[plane]; bottom = lower[pipe];
for (num_rects = drw->num_rects; num_rects--; rect++) { for (num_rects = drw->num_rects; num_rects--; rect++) {
int y1 = max(rect->y1, top); int y1 = max(rect->y1, top);
@@ -302,6 +273,7 @@ static void i915_vblank_tasklet(struct drm_device *dev)
} }
spin_unlock_irqrestore(&dev->drw_lock, irqflags); spin_unlock_irqrestore(&dev->drw_lock, irqflags);
mutex_unlock(&dev->struct_mutex);
list_for_each_safe(hit, tmp, &hits) { list_for_each_safe(hit, tmp, &hits) {
drm_i915_vbl_swap_t *swap_hit = drm_i915_vbl_swap_t *swap_hit =
@@ -313,15 +285,16 @@ static void i915_vblank_tasklet(struct drm_device *dev)
} }
} }
u32 i915_get_vblank_counter(struct drm_device *dev, int plane) /* Called from drm generic code, passed a 'crtc', which
* we use as a pipe index
*/
u32 i915_get_vblank_counter(struct drm_device *dev, int pipe)
{ {
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
unsigned long high_frame; unsigned long high_frame;
unsigned long low_frame; unsigned long low_frame;
u32 high1, high2, low, count; u32 high1, high2, low, count;
int pipe;
pipe = i915_get_pipe(dev, plane);
high_frame = pipe ? PIPEBFRAMEHIGH : PIPEAFRAMEHIGH; high_frame = pipe ? PIPEBFRAMEHIGH : PIPEAFRAMEHIGH;
low_frame = pipe ? PIPEBFRAMEPIXEL : PIPEAFRAMEPIXEL; low_frame = pipe ? PIPEBFRAMEPIXEL : PIPEAFRAMEPIXEL;
@@ -350,18 +323,37 @@ u32 i915_get_vblank_counter(struct drm_device *dev, int plane)
} }
void void
i915_gem_vblank_work_handler(struct work_struct *work) i915_vblank_work_handler(struct work_struct *work)
{ {
drm_i915_private_t *dev_priv; drm_i915_private_t *dev_priv = container_of(work, drm_i915_private_t,
struct drm_device *dev; vblank_work);
struct drm_device *dev = dev_priv->dev;
unsigned long irqflags;
dev_priv = container_of(work, drm_i915_private_t, if (dev->lock.hw_lock == NULL) {
mm.vblank_work);
dev = dev_priv->dev;
mutex_lock(&dev->struct_mutex);
i915_vblank_tasklet(dev); i915_vblank_tasklet(dev);
mutex_unlock(&dev->struct_mutex); return;
}
spin_lock_irqsave(&dev->tasklet_lock, irqflags);
dev->locked_tasklet_func = i915_vblank_tasklet;
spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
/* Try to get the lock now, if this fails, the lock
* holder will execute the tasklet during unlock
*/
if (!drm_lock_take(&dev->lock, DRM_KERNEL_CONTEXT))
return;
dev->lock.lock_time = jiffies;
atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
spin_lock_irqsave(&dev->tasklet_lock, irqflags);
dev->locked_tasklet_func = NULL;
spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
i915_vblank_tasklet(dev);
drm_lock_free(&dev->lock, DRM_KERNEL_CONTEXT);
} }
irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS) irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
@@ -398,7 +390,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
else if (pipea_stats & (PIPE_START_VBLANK_INTERRUPT_STATUS| else if (pipea_stats & (PIPE_START_VBLANK_INTERRUPT_STATUS|
PIPE_VBLANK_INTERRUPT_STATUS)) { PIPE_VBLANK_INTERRUPT_STATUS)) {
vblank++; vblank++;
drm_handle_vblank(dev, i915_get_plane(dev, 0)); drm_handle_vblank(dev, 0);
} }
I915_WRITE(PIPEASTAT, pipea_stats); I915_WRITE(PIPEASTAT, pipea_stats);
@@ -416,7 +408,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
else if (pipeb_stats & (PIPE_START_VBLANK_INTERRUPT_STATUS| else if (pipeb_stats & (PIPE_START_VBLANK_INTERRUPT_STATUS|
PIPE_VBLANK_INTERRUPT_STATUS)) { PIPE_VBLANK_INTERRUPT_STATUS)) {
vblank++; vblank++;
drm_handle_vblank(dev, i915_get_plane(dev, 1)); drm_handle_vblank(dev, 1);
} }
if (pipeb_stats & I915_LEGACY_BLC_EVENT_STATUS) if (pipeb_stats & I915_LEGACY_BLC_EVENT_STATUS)
@@ -441,12 +433,8 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
if (iir & I915_ASLE_INTERRUPT) if (iir & I915_ASLE_INTERRUPT)
opregion_asle_intr(dev); opregion_asle_intr(dev);
if (vblank && dev_priv->swaps_pending > 0) { if (vblank && dev_priv->swaps_pending > 0)
if (dev_priv->ring.ring_obj == NULL) schedule_work(&dev_priv->vblank_work);
drm_locked_tasklet(dev, i915_vblank_tasklet);
else
schedule_work(&dev_priv->mm.vblank_work);
}
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@@ -481,22 +469,24 @@ static int i915_emit_irq(struct drm_device * dev)
void i915_user_irq_get(struct drm_device *dev) void i915_user_irq_get(struct drm_device *dev)
{ {
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
unsigned long irqflags;
spin_lock(&dev_priv->user_irq_lock); spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
if (dev->irq_enabled && (++dev_priv->user_irq_refcount == 1)) if (dev->irq_enabled && (++dev_priv->user_irq_refcount == 1))
i915_enable_irq(dev_priv, I915_USER_INTERRUPT); i915_enable_irq(dev_priv, I915_USER_INTERRUPT);
spin_unlock(&dev_priv->user_irq_lock); spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
} }
void i915_user_irq_put(struct drm_device *dev) void i915_user_irq_put(struct drm_device *dev)
{ {
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
unsigned long irqflags;
spin_lock(&dev_priv->user_irq_lock); spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
BUG_ON(dev->irq_enabled && dev_priv->user_irq_refcount <= 0); BUG_ON(dev->irq_enabled && dev_priv->user_irq_refcount <= 0);
if (dev->irq_enabled && (--dev_priv->user_irq_refcount == 0)) if (dev->irq_enabled && (--dev_priv->user_irq_refcount == 0))
i915_disable_irq(dev_priv, I915_USER_INTERRUPT); i915_disable_irq(dev_priv, I915_USER_INTERRUPT);
spin_unlock(&dev_priv->user_irq_lock); spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
} }
static int i915_wait_irq(struct drm_device * dev, int irq_nr) static int i915_wait_irq(struct drm_device * dev, int irq_nr)
@@ -578,29 +568,42 @@ int i915_irq_wait(struct drm_device *dev, void *data,
return i915_wait_irq(dev, irqwait->irq_seq); return i915_wait_irq(dev, irqwait->irq_seq);
} }
int i915_enable_vblank(struct drm_device *dev, int plane) /* Called from drm generic code, passed 'crtc' which
* we use as a pipe index
*/
int i915_enable_vblank(struct drm_device *dev, int pipe)
{ {
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
int pipe = i915_get_pipe(dev, plane);
u32 pipestat_reg = 0; u32 pipestat_reg = 0;
u32 pipestat; u32 pipestat;
u32 interrupt = 0;
unsigned long irqflags;
switch (pipe) { switch (pipe) {
case 0: case 0:
pipestat_reg = PIPEASTAT; pipestat_reg = PIPEASTAT;
i915_enable_irq(dev_priv, I915_DISPLAY_PIPE_A_EVENT_INTERRUPT); interrupt = I915_DISPLAY_PIPE_A_EVENT_INTERRUPT;
break; break;
case 1: case 1:
pipestat_reg = PIPEBSTAT; pipestat_reg = PIPEBSTAT;
i915_enable_irq(dev_priv, I915_DISPLAY_PIPE_B_EVENT_INTERRUPT); interrupt = I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
break; break;
default: default:
DRM_ERROR("tried to enable vblank on non-existent pipe %d\n", DRM_ERROR("tried to enable vblank on non-existent pipe %d\n",
pipe); pipe);
break; return 0;
} }
if (pipestat_reg) { spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
/* Enabling vblank events in IMR comes before PIPESTAT write, or
* there's a race where the PIPESTAT vblank bit gets set to 1, so
* the OR of enabled PIPESTAT bits goes to 1, so the PIPExEVENT in
* ISR flashes to 1, but the IIR bit doesn't get set to 1 because
* IMR masks it. It doesn't ever get set after we clear the masking
* in IMR because the ISR bit is edge, not level-triggered, on the
* OR of PIPESTAT bits.
*/
i915_enable_irq(dev_priv, interrupt);
pipestat = I915_READ(pipestat_reg); pipestat = I915_READ(pipestat_reg);
if (IS_I965G(dev)) if (IS_I965G(dev))
pipestat |= PIPE_START_VBLANK_INTERRUPT_ENABLE; pipestat |= PIPE_START_VBLANK_INTERRUPT_ENABLE;
@@ -610,34 +613,41 @@ int i915_enable_vblank(struct drm_device *dev, int plane)
pipestat |= (PIPE_START_VBLANK_INTERRUPT_STATUS | pipestat |= (PIPE_START_VBLANK_INTERRUPT_STATUS |
PIPE_VBLANK_INTERRUPT_STATUS); PIPE_VBLANK_INTERRUPT_STATUS);
I915_WRITE(pipestat_reg, pipestat); I915_WRITE(pipestat_reg, pipestat);
} (void) I915_READ(pipestat_reg); /* Posting read */
spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
return 0; return 0;
} }
void i915_disable_vblank(struct drm_device *dev, int plane) /* Called from drm generic code, passed 'crtc' which
* we use as a pipe index
*/
void i915_disable_vblank(struct drm_device *dev, int pipe)
{ {
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
int pipe = i915_get_pipe(dev, plane);
u32 pipestat_reg = 0; u32 pipestat_reg = 0;
u32 pipestat; u32 pipestat;
u32 interrupt = 0;
unsigned long irqflags;
switch (pipe) { switch (pipe) {
case 0: case 0:
pipestat_reg = PIPEASTAT; pipestat_reg = PIPEASTAT;
i915_disable_irq(dev_priv, I915_DISPLAY_PIPE_A_EVENT_INTERRUPT); interrupt = I915_DISPLAY_PIPE_A_EVENT_INTERRUPT;
break; break;
case 1: case 1:
pipestat_reg = PIPEBSTAT; pipestat_reg = PIPEBSTAT;
i915_disable_irq(dev_priv, I915_DISPLAY_PIPE_B_EVENT_INTERRUPT); interrupt = I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
break; break;
default: default:
DRM_ERROR("tried to disable vblank on non-existent pipe %d\n", DRM_ERROR("tried to disable vblank on non-existent pipe %d\n",
pipe); pipe);
return;
break; break;
} }
if (pipestat_reg) { spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
i915_disable_irq(dev_priv, interrupt);
pipestat = I915_READ(pipestat_reg); pipestat = I915_READ(pipestat_reg);
pipestat &= ~(PIPE_START_VBLANK_INTERRUPT_ENABLE | pipestat &= ~(PIPE_START_VBLANK_INTERRUPT_ENABLE |
PIPE_VBLANK_INTERRUPT_ENABLE); PIPE_VBLANK_INTERRUPT_ENABLE);
@@ -645,7 +655,8 @@ void i915_disable_vblank(struct drm_device *dev, int plane)
pipestat |= (PIPE_START_VBLANK_INTERRUPT_STATUS | pipestat |= (PIPE_START_VBLANK_INTERRUPT_STATUS |
PIPE_VBLANK_INTERRUPT_STATUS); PIPE_VBLANK_INTERRUPT_STATUS);
I915_WRITE(pipestat_reg, pipestat); I915_WRITE(pipestat_reg, pipestat);
} (void) I915_READ(pipestat_reg); /* Posting read */
spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
} }
/* Set the vblank monitor pipe /* Set the vblank monitor pipe
@@ -687,8 +698,8 @@ int i915_vblank_swap(struct drm_device *dev, void *data,
{ {
drm_i915_private_t *dev_priv = dev->dev_private; drm_i915_private_t *dev_priv = dev->dev_private;
drm_i915_vblank_swap_t *swap = data; drm_i915_vblank_swap_t *swap = data;
drm_i915_vbl_swap_t *vbl_swap; drm_i915_vbl_swap_t *vbl_swap, *vbl_old;
unsigned int pipe, seqtype, curseq, plane; unsigned int pipe, seqtype, curseq;
unsigned long irqflags; unsigned long irqflags;
struct list_head *list; struct list_head *list;
int ret; int ret;
@@ -709,8 +720,7 @@ int i915_vblank_swap(struct drm_device *dev, void *data,
return -EINVAL; return -EINVAL;
} }
plane = (swap->seqtype & _DRM_VBLANK_SECONDARY) ? 1 : 0; pipe = (swap->seqtype & _DRM_VBLANK_SECONDARY) ? 1 : 0;
pipe = i915_get_pipe(dev, plane);
seqtype = swap->seqtype & (_DRM_VBLANK_RELATIVE | _DRM_VBLANK_ABSOLUTE); seqtype = swap->seqtype & (_DRM_VBLANK_RELATIVE | _DRM_VBLANK_ABSOLUTE);
@@ -751,28 +761,6 @@ int i915_vblank_swap(struct drm_device *dev, void *data,
} }
} }
spin_lock_irqsave(&dev_priv->swaps_lock, irqflags);
list_for_each(list, &dev_priv->vbl_swaps.head) {
vbl_swap = list_entry(list, drm_i915_vbl_swap_t, head);
if (vbl_swap->drw_id == swap->drawable &&
vbl_swap->plane == plane &&
vbl_swap->sequence == swap->sequence) {
spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
DRM_DEBUG("Already scheduled\n");
return 0;
}
}
spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
if (dev_priv->swaps_pending >= 100) {
DRM_DEBUG("Too many swaps queued\n");
drm_vblank_put(dev, pipe);
return -EBUSY;
}
vbl_swap = drm_calloc(1, sizeof(*vbl_swap), DRM_MEM_DRIVER); vbl_swap = drm_calloc(1, sizeof(*vbl_swap), DRM_MEM_DRIVER);
if (!vbl_swap) { if (!vbl_swap) {
@@ -781,14 +769,44 @@ int i915_vblank_swap(struct drm_device *dev, void *data,
return -ENOMEM; return -ENOMEM;
} }
DRM_DEBUG("\n");
vbl_swap->drw_id = swap->drawable; vbl_swap->drw_id = swap->drawable;
vbl_swap->plane = plane; vbl_swap->pipe = pipe;
vbl_swap->sequence = swap->sequence; vbl_swap->sequence = swap->sequence;
spin_lock_irqsave(&dev_priv->swaps_lock, irqflags); spin_lock_irqsave(&dev_priv->swaps_lock, irqflags);
list_for_each(list, &dev_priv->vbl_swaps.head) {
vbl_old = list_entry(list, drm_i915_vbl_swap_t, head);
if (vbl_old->drw_id == swap->drawable &&
vbl_old->pipe == pipe &&
vbl_old->sequence == swap->sequence) {
spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
drm_vblank_put(dev, pipe);
drm_free(vbl_swap, sizeof(*vbl_swap), DRM_MEM_DRIVER);
DRM_DEBUG("Already scheduled\n");
return 0;
}
}
if (dev_priv->swaps_pending >= 10) {
DRM_DEBUG("Too many swaps queued\n");
DRM_DEBUG(" pipe 0: %d pipe 1: %d\n",
drm_vblank_count(dev, 0),
drm_vblank_count(dev, 1));
list_for_each(list, &dev_priv->vbl_swaps.head) {
vbl_old = list_entry(list, drm_i915_vbl_swap_t, head);
DRM_DEBUG("\tdrw %x pipe %d seq %x\n",
vbl_old->drw_id, vbl_old->pipe,
vbl_old->sequence);
}
spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
drm_vblank_put(dev, pipe);
drm_free(vbl_swap, sizeof(*vbl_swap), DRM_MEM_DRIVER);
return -EBUSY;
}
list_add_tail(&vbl_swap->head, &dev_priv->vbl_swaps.head); list_add_tail(&vbl_swap->head, &dev_priv->vbl_swaps.head);
dev_priv->swaps_pending++; dev_priv->swaps_pending++;
@@ -815,6 +833,7 @@ int i915_driver_irq_postinstall(struct drm_device *dev)
spin_lock_init(&dev_priv->swaps_lock); spin_lock_init(&dev_priv->swaps_lock);
INIT_LIST_HEAD(&dev_priv->vbl_swaps.head); INIT_LIST_HEAD(&dev_priv->vbl_swaps.head);
INIT_WORK(&dev_priv->vblank_work, i915_vblank_work_handler);
dev_priv->swaps_pending = 0; dev_priv->swaps_pending = 0;
/* Set initial unmasked IRQs to just the selected vblank pipes. */ /* Set initial unmasked IRQs to just the selected vblank pipes. */