Skip to content

Commit 17efca9

Browse files
airliedairlied
committed
Merge tag 'topic/drm-misc-2016-03-22' of git://anongit.freedesktop.org/drm-intel into drm-next
Bunch of small fixupes all over. Plus a dma-buf patch that Sumit asked me to cherry-pick since that's the only one he had in his tree. There's a sparse issue outstanding in the color mgr stuff, but Lionel is still working on something that actually appeases sparse. * tag 'topic/drm-misc-2016-03-22' of git://anongit.freedesktop.org/drm-intel: dma-buf/fence: fix fence_is_later v2 dma-buf: Update docs for SYNC ioctl drm: remove excess description dma-buf, drm, ion: Propagate error code from dma_buf_start_cpu_access() drm/atmel-hlcdc: use helper to get crtc state drm/atomic: use helper to get crtc state
2 parents 568d7c7 + b47bcb9 commit 17efca9

File tree

11 files changed

+45
-40
lines changed

11 files changed

+45
-40
lines changed

‎Documentation/dma-buf-sharing.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,8 @@ Being able to mmap an export dma-buf buffer object has 2 main use-cases:
352352

353353
No special interfaces, userspace simply calls mmap on the dma-buf fd, making
354354
sure that the cache synchronization ioctl (DMA_BUF_IOCTL_SYNC) is *always*
355-
used when the access happens. This is discussed next paragraphs.
355+
used when the access happens. Note that DMA_BUF_IOCTL_SYNC can fail with
356+
-EAGAIN or -EINTR, in which case it must be restarted.
356357

357358
Some systems might need some sort of cache coherency management e.g. when
358359
CPU and GPU domains are being accessed through dma-buf at the same time. To
@@ -366,10 +367,10 @@ Being able to mmap an export dma-buf buffer object has 2 main use-cases:
366367
want (with the new data being consumed by the GPU or say scanout device)
367368
- munmap once you don't need the buffer any more
368369

369-
Therefore, for correctness and optimal performance, systems with the memory
370-
cache shared by the GPU and CPU i.e. the "coherent" and also the
371-
"incoherent" are always required to use SYNC_START and SYNC_END before and
372-
after, respectively, when accessing the mapped address.
370+
For correctness and optimal performance, it is always required to use
371+
SYNC_START and SYNC_END before and after, respectively, when accessing the
372+
mapped address. Userspace cannot rely on coherent access, even when there
373+
are systems where it just works without calling these ioctls.
373374

374375
2. Supporting existing mmap interfaces in importers
375376

‎drivers/dma-buf/dma-buf.c

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ static long dma_buf_ioctl(struct file *file,
259259
struct dma_buf *dmabuf;
260260
struct dma_buf_sync sync;
261261
enum dma_data_direction direction;
262+
int ret;
262263

263264
dmabuf = file->private_data;
264265

@@ -285,11 +286,11 @@ static long dma_buf_ioctl(struct file *file,
285286
}
286287

287288
if (sync.flags & DMA_BUF_SYNC_END)
288-
dma_buf_end_cpu_access(dmabuf, direction);
289+
ret = dma_buf_end_cpu_access(dmabuf, direction);
289290
else
290-
dma_buf_begin_cpu_access(dmabuf, direction);
291+
ret = dma_buf_begin_cpu_access(dmabuf, direction);
291292

292-
return 0;
293+
return ret;
293294
default:
294295
return -ENOTTY;
295296
}
@@ -611,15 +612,19 @@ EXPORT_SYMBOL_GPL(dma_buf_begin_cpu_access);
611612
* @dmabuf: [in] buffer to complete cpu access for.
612613
* @direction: [in] length of range for cpu access.
613614
*
614-
* This call must always succeed.
615+
* Can return negative error values, returns 0 on success.
615616
*/
616-
void dma_buf_end_cpu_access(struct dma_buf *dmabuf,
617-
enum dma_data_direction direction)
617+
int dma_buf_end_cpu_access(struct dma_buf *dmabuf,
618+
enum dma_data_direction direction)
618619
{
620+
int ret = 0;
621+
619622
WARN_ON(!dmabuf);
620623

621624
if (dmabuf->ops->end_cpu_access)
622-
dmabuf->ops->end_cpu_access(dmabuf, direction);
625+
ret = dmabuf->ops->end_cpu_access(dmabuf, direction);
626+
627+
return ret;
623628
}
624629
EXPORT_SYMBOL_GPL(dma_buf_end_cpu_access);
625630

‎drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ static int atmel_hlcdc_plane_atomic_check(struct drm_plane *p,
558558
if (!state->base.crtc || !fb)
559559
return 0;
560560

561-
crtc_state = s->state->crtc_states[drm_crtc_index(s->crtc)];
561+
crtc_state = drm_atomic_get_existing_crtc_state(s->state, s->crtc);
562562
mode = &crtc_state->adjusted_mode;
563563

564564
state->src_x = s->src_x;

‎drivers/gpu/drm/drm_atomic.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,6 @@ EXPORT_SYMBOL(drm_atomic_set_mode_prop_for_crtc);
380380
* drm_atomic_replace_property_blob - replace a blob property
381381
* @blob: a pointer to the member blob to be replaced
382382
* @new_blob: the new blob to replace with
383-
* @expected_size: the expected size of the new blob
384383
* @replaced: whether the blob has been replaced
385384
*
386385
* RETURNS:

‎drivers/gpu/drm/drm_atomic_helper.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ drm_atomic_helper_plane_changed(struct drm_atomic_state *state,
6767
struct drm_crtc_state *crtc_state;
6868

6969
if (plane->state->crtc) {
70-
crtc_state = state->crtc_states[drm_crtc_index(plane->state->crtc)];
70+
crtc_state = drm_atomic_get_existing_crtc_state(state,
71+
plane->state->crtc);
7172

7273
if (WARN_ON(!crtc_state))
7374
return;
@@ -76,8 +77,8 @@ drm_atomic_helper_plane_changed(struct drm_atomic_state *state,
7677
}
7778

7879
if (plane_state->crtc) {
79-
crtc_state =
80-
state->crtc_states[drm_crtc_index(plane_state->crtc)];
80+
crtc_state = drm_atomic_get_existing_crtc_state(state,
81+
plane_state->crtc);
8182

8283
if (WARN_ON(!crtc_state))
8384
return;
@@ -374,8 +375,8 @@ mode_fixup(struct drm_atomic_state *state)
374375
if (!conn_state->crtc || !conn_state->best_encoder)
375376
continue;
376377

377-
crtc_state =
378-
state->crtc_states[drm_crtc_index(conn_state->crtc)];
378+
crtc_state = drm_atomic_get_existing_crtc_state(state,
379+
conn_state->crtc);
379380

380381
/*
381382
* Each encoder has at most one connector (since we always steal
@@ -679,7 +680,8 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state)
679680
if (!old_conn_state->crtc)
680681
continue;
681682

682-
old_crtc_state = old_state->crtc_states[drm_crtc_index(old_conn_state->crtc)];
683+
old_crtc_state = drm_atomic_get_existing_crtc_state(old_state,
684+
old_conn_state->crtc);
683685

684686
if (!old_crtc_state->active ||
685687
!drm_atomic_crtc_needs_modeset(old_conn_state->crtc->state))

‎drivers/gpu/drm/i915/i915_gem_dmabuf.c

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -228,25 +228,20 @@ static int i915_gem_begin_cpu_access(struct dma_buf *dma_buf, enum dma_data_dire
228228
return ret;
229229
}
230230

231-
static void i915_gem_end_cpu_access(struct dma_buf *dma_buf, enum dma_data_direction direction)
231+
static int i915_gem_end_cpu_access(struct dma_buf *dma_buf, enum dma_data_direction direction)
232232
{
233233
struct drm_i915_gem_object *obj = dma_buf_to_obj(dma_buf);
234234
struct drm_device *dev = obj->base.dev;
235-
struct drm_i915_private *dev_priv = to_i915(dev);
236-
bool was_interruptible;
237235
int ret;
238236

239-
mutex_lock(&dev->struct_mutex);
240-
was_interruptible = dev_priv->mm.interruptible;
241-
dev_priv->mm.interruptible = false;
237+
ret = i915_mutex_lock_interruptible(dev);
238+
if (ret)
239+
return ret;
242240

243241
ret = i915_gem_object_set_to_gtt_domain(obj, false);
244-
245-
dev_priv->mm.interruptible = was_interruptible;
246242
mutex_unlock(&dev->struct_mutex);
247243

248-
if (unlikely(ret))
249-
DRM_ERROR("unable to flush buffer following CPU access; rendering may be corrupt\n");
244+
return ret;
250245
}
251246

252247
static const struct dma_buf_ops i915_dmabuf_ops = {

‎drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,12 @@ static int omap_gem_dmabuf_begin_cpu_access(struct dma_buf *buffer,
9797
return omap_gem_get_pages(obj, &pages, true);
9898
}
9999

100-
static void omap_gem_dmabuf_end_cpu_access(struct dma_buf *buffer,
101-
enum dma_data_direction dir)
100+
static int omap_gem_dmabuf_end_cpu_access(struct dma_buf *buffer,
101+
enum dma_data_direction dir)
102102
{
103103
struct drm_gem_object *obj = buffer->priv;
104104
omap_gem_put_pages(obj);
105+
return 0;
105106
}
106107

107108

‎drivers/gpu/drm/udl/udl_fb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,8 +423,8 @@ static int udl_user_framebuffer_dirty(struct drm_framebuffer *fb,
423423
}
424424

425425
if (ufb->obj->base.import_attach) {
426-
dma_buf_end_cpu_access(ufb->obj->base.import_attach->dmabuf,
427-
DMA_FROM_DEVICE);
426+
ret = dma_buf_end_cpu_access(ufb->obj->base.import_attach->dmabuf,
427+
DMA_FROM_DEVICE);
428428
}
429429

430430
unlock:

‎drivers/staging/android/ion/ion.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,14 +1075,16 @@ static int ion_dma_buf_begin_cpu_access(struct dma_buf *dmabuf,
10751075
return PTR_ERR_OR_ZERO(vaddr);
10761076
}
10771077

1078-
static void ion_dma_buf_end_cpu_access(struct dma_buf *dmabuf,
1079-
enum dma_data_direction direction)
1078+
static int ion_dma_buf_end_cpu_access(struct dma_buf *dmabuf,
1079+
enum dma_data_direction direction)
10801080
{
10811081
struct ion_buffer *buffer = dmabuf->priv;
10821082

10831083
mutex_lock(&buffer->lock);
10841084
ion_buffer_kmap_put(buffer);
10851085
mutex_unlock(&buffer->lock);
1086+
1087+
return 0;
10861088
}
10871089

10881090
static struct dma_buf_ops dma_buf_ops = {

‎include/linux/dma-buf.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ struct dma_buf_ops {
9494
void (*release)(struct dma_buf *);
9595

9696
int (*begin_cpu_access)(struct dma_buf *, enum dma_data_direction);
97-
void (*end_cpu_access)(struct dma_buf *, enum dma_data_direction);
97+
int (*end_cpu_access)(struct dma_buf *, enum dma_data_direction);
9898
void *(*kmap_atomic)(struct dma_buf *, unsigned long);
9999
void (*kunmap_atomic)(struct dma_buf *, unsigned long, void *);
100100
void *(*kmap)(struct dma_buf *, unsigned long);
@@ -224,8 +224,8 @@ void dma_buf_unmap_attachment(struct dma_buf_attachment *, struct sg_table *,
224224
enum dma_data_direction);
225225
int dma_buf_begin_cpu_access(struct dma_buf *dma_buf,
226226
enum dma_data_direction dir);
227-
void dma_buf_end_cpu_access(struct dma_buf *dma_buf,
228-
enum dma_data_direction dir);
227+
int dma_buf_end_cpu_access(struct dma_buf *dma_buf,
228+
enum dma_data_direction dir);
229229
void *dma_buf_kmap_atomic(struct dma_buf *, unsigned long);
230230
void dma_buf_kunmap_atomic(struct dma_buf *, unsigned long, void *);
231231
void *dma_buf_kmap(struct dma_buf *, unsigned long);

‎include/linux/fence.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ static inline bool fence_is_later(struct fence *f1, struct fence *f2)
292292
if (WARN_ON(f1->context != f2->context))
293293
return false;
294294

295-
return f1->seqno - f2->seqno < INT_MAX;
295+
return (int)(f1->seqno - f2->seqno) > 0;
296296
}
297297

298298
/**

0 commit comments

Comments
 (0)