diff options
| author | Joel Stanley <joel@jms.id.au> | 2018-11-27 08:23:56 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2018-11-27 08:24:09 +0300 |
| commit | d608acfd4ac3fe17f3081bee8fcd4dcd896c2ffa (patch) | |
| tree | ade4450a72a2e358a1d2e5cde321de0097fb291c /drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | |
| parent | 62ccc3924eff37012bd0c227d8b7dc71188fc358 (diff) | |
| parent | a9da8725b7a744be3ff0ff44cab2547e4d1e6675 (diff) | |
| download | linux-dev-4.18.tar.xz | |
Merge tag 'v4.18.20' into dev-4.18dev-4.18
This is the 4.18.20 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_dmm_tiler.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c index f92fe205550b..e884183c018a 100644 --- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c +++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c @@ -285,6 +285,17 @@ static int dmm_txn_commit(struct dmm_txn *txn, bool wait) } txn->last_pat->next_pa = 0; + /* ensure that the written descriptors are visible to DMM */ + wmb(); + + /* + * NOTE: the wmb() above should be enough, but there seems to be a bug + * in OMAP's memory barrier implementation, which in some rare cases may + * cause the writes not to be observable after wmb(). + */ + + /* read back to ensure the data is in RAM */ + readl(&txn->last_pat->next_pa); /* write to PAT_DESCR to clear out any pending transaction */ dmm_write(dmm, 0x0, reg[PAT_DESCR][engine->id]); |