Page MenuHomeFreeBSD
Files F150953948

D3495.diff
No OneTemporary
Actions

D3495.diff
View Options

Index: head/sys/dev/drm2/i915/i915_dma.c
===================================================================
--- head/sys/dev/drm2/i915/i915_dma.c
+++ head/sys/dev/drm2/i915/i915_dma.c
@@ -410,21 +410,8 @@
return 0;
}
-int i915_emit_box(struct drm_device * dev,
- struct drm_clip_rect *boxes,
- int i, int DR1, int DR4)
-{
- struct drm_clip_rect box;
-
- if (DRM_COPY_FROM_USER_UNCHECKED(&box, &boxes[i], sizeof(box))) {
- return -EFAULT;
- }
-
- return (i915_emit_box_p(dev, &box, DR1, DR4));
-}
-
int
-i915_emit_box_p(struct drm_device *dev,
+i915_emit_box(struct drm_device *dev,
struct drm_clip_rect *box,
int DR1, int DR4)
{
@@ -506,8 +493,8 @@
for (i = 0; i < count; i++) {
if (i < nbox) {
- ret = i915_emit_box_p(dev, &cmd->cliprects[i],
- cmd->DR1, cmd->DR4);
+ ret = i915_emit_box(dev, &cliprects[i],
+ cmd->DR1, cmd->DR4);
if (ret)
return ret;
}
@@ -542,8 +529,8 @@
count = nbox ? nbox : 1;
for (i = 0; i < count; i++) {
if (i < nbox) {
- int ret = i915_emit_box_p(dev, &cliprects[i],
- batch->DR1, batch->DR4);
+ ret = i915_emit_box(dev, &cliprects[i],
+ batch->DR1, batch->DR4);
if (ret)
return ret;
}
Index: head/sys/dev/drm2/i915/i915_drv.h
===================================================================
--- head/sys/dev/drm2/i915/i915_drv.h
+++ head/sys/dev/drm2/i915/i915_drv.h
@@ -1120,11 +1120,8 @@
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,
- int i, int DR1, int DR4);
-int i915_emit_box_p(struct drm_device *dev, struct drm_clip_rect *box,
- int DR1, int DR4);
-
+ struct drm_clip_rect *box,
+ int DR1, int DR4);
unsigned long i915_chipset_val(struct drm_i915_private *dev_priv);
unsigned long i915_mch_val(struct drm_i915_private *dev_priv);
void i915_update_gfx_val(struct drm_i915_private *dev_priv);
Index: head/sys/dev/drm2/i915/i915_gem_execbuffer.c
===================================================================
--- head/sys/dev/drm2/i915/i915_gem_execbuffer.c
+++ head/sys/dev/drm2/i915/i915_gem_execbuffer.c
@@ -1372,7 +1372,7 @@
if (cliprects) {
for (i = 0; i < args->num_cliprects; i++) {
- ret = i915_emit_box_p(dev, &cliprects[i],
+ ret = i915_emit_box(dev, &cliprects[i],
args->DR1, args->DR4);
if (ret)
goto err;

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 6, 4:16 AM (7 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30936814
Default Alt Text
D3495.diff (2 KB)

Event Timeline