lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/nv84: fix minor issues in PCRYPT implementation

Browse Source 
Fix running of destroy_context() when create_context() has never been
called for the channel, and fill in engine's tlb_flush() function pointer.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs
2010-11-15 16:28:19 +10:00
parent 7b4808bb6e
commit 2cb3d3b6c6
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/nouveau/nouveau_state.c
View File

@@ -437,6 +437,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
engine->crypt.takedown = nv84_crypt_fini; engine->crypt.takedown = nv84_crypt_fini;
engine->crypt.create_context = nv84_crypt_create_context; engine->crypt.create_context = nv84_crypt_create_context;
engine->crypt.destroy_context = nv84_crypt_destroy_context; engine->crypt.destroy_context = nv84_crypt_destroy_context;
engine->crypt.tlb_flush = nv84_crypt_tlb_flush;
break; break;
default: default:
engine->crypt.init = nouveau_stub_init; engine->crypt.init = nouveau_stub_init;

2
drivers/gpu/drm/nouveau/nv84_crypt.c
View File

@@ -61,7 +61,7 @@ nv84_crypt_destroy_context(struct nouveau_channel *chan)
struct drm_device *dev = chan->dev; struct drm_device *dev = chan->dev;
u32 inst; u32 inst;
if (!chan->ramin) if (!chan->crypt_ctx)
return; return;
inst = (chan->ramin->vinst >> 12); inst = (chan->ramin->vinst >> 12);