diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2021-07-11 20:59:48 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2021-07-11 20:59:48 +0200 |
| commit | 9fbd8d1c994b6e6e2e4934b2fb67a69a45e257a1 (patch) | |
| tree | 20665ddab2e3fa3cc064ab448f585383c96c8bb5 /drivers/gpu | |
| parent | b5f0035416310da3ccfaf160e6d856c294ec3bf5 (diff) | |
| parent | ee3696c90e3cce141a74b14531cdf2650df2c566 (diff) | |
Merge 4.4.275 into android-4.4-p
Changes in 4.4.275
scsi: sr: Return appropriate error code when disk is ejected
drm/nouveau: fix dma_address check for CPU/GPU sync
xen/events: reset active flag for lateeoi events later
arm: kprobes: Allow to handle reentered kprobe on single-stepping
Linux 4.4.275
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I1e8c44b8a261a4549080c42a7970fd64554d9853
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 78f520d05de9..58c310930bf2 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -458,7 +458,7 @@ nouveau_bo_sync_for_device(struct nouveau_bo *nvbo) struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm; int i; - if (!ttm_dma) + if (!ttm_dma || !ttm_dma->dma_address) return; /* Don't waste time looping if the object is coherent */ @@ -478,7 +478,7 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo) struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm; int i; - if (!ttm_dma) + if (!ttm_dma || !ttm_dma->dma_address) return; /* Don't waste time looping if the object is coherent */ |