diff options
| author | Eric Anholt <eric@anholt.net> | 2009-03-11 12:30:04 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-03-27 14:47:34 -0700 |
| commit | 201361a54ed187d8595a283e3a4ddb213bc8323b (patch) | |
| tree | 12a5d23a45f72f8bd917161735d55985654b52e0 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | eb01459fbbccb4ca0b879cbfc97e33ac6eabf975 (diff) | |
| download | blackbird-op-linux-201361a54ed187d8595a283e3a4ddb213bc8323b.tar.gz blackbird-op-linux-201361a54ed187d8595a283e3a4ddb213bc8323b.zip | |
drm/i915: Fix lock order reversal with cliprects and cmdbuf in non-DRI2 paths.
This introduces allocation in the batch submission path that wasn't there
previously, but these are compatibility paths so we care about simplicity
more than performance.
kernel.org bug #12419.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 75e33844146b..2c02ce6b2b98 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -520,7 +520,7 @@ extern int i915_driver_device_is_agp(struct drm_device * dev); extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); extern int i915_emit_box(struct drm_device *dev, - struct drm_clip_rect __user *boxes, + struct drm_clip_rect *boxes, int i, int DR1, int DR4); /* i915_irq.c */ |
