xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
派生 0
代码 工单 合并请求 工作流 软件包 项目 发布 百科 活动

drm/nouveau/fence: fix a race where fence->channel can disappear

浏览代码 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
这个提交包含在：
Ben Skeggs
2012-05-04 16:25:47 +10:00
父节点 299bee10fb
当前提交 906c033e27
共修改 6 个文件，包含 26 行新增和 15 行删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

8
drivers/gpu/drm/nouveau/nv84_fence.c
查看文件

@@ -55,16 +55,18 @@ nv84_fence_emit(struct nouveau_fence *fence)
return ret;
}
static int
nv84_fence_sync(struct nouveau_fence *fence, struct nouveau_channel *chan)
nv84_fence_sync(struct nouveau_fence *fence,
struct nouveau_channel *prev, struct nouveau_channel *chan)
{
int ret = RING_SPACE(chan, 7);
if (ret == 0) {
BEGIN_NV04(chan, 0, NV11_SUBCHAN_DMA_SEMAPHORE, 1);
OUT_RING (chan, NvSema);
BEGIN_NV04(chan, 0, NV84_SUBCHAN_SEMAPHORE_ADDRESS_HIGH, 4);
OUT_RING (chan, upper_32_bits(fence->channel->id * 16));
OUT_RING (chan, lower_32_bits(fence->channel->id * 16));
OUT_RING (chan, upper_32_bits(prev->id * 16));
OUT_RING (chan, lower_32_bits(prev->id * 16));
OUT_RING (chan, fence->sequence);
OUT_RING (chan, NV84_SUBCHAN_SEMAPHORE_TRIGGER_ACQUIRE_GEQUAL);
FIRE_RING (chan);