diff options
author | Emil Velikov <emil.l.velikov@gmail.com> | 2013-07-28 21:00:23 +0100 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2013-07-30 13:01:13 +1000 |
commit | 71ed159b95565844af3aed60d237b8253c41031a (patch) | |
tree | 4bbf40626b9bdb79a76d7eff6292da06c06f3077 | |
parent | 6090e53a0bec2a0c97eab9dba6100e7c0ec813e3 (diff) |
disp/nv50-: remove dcb_outp_match call, and related variables
Unused and irrelavant since the code move of DP training/linkcontrol interrupt
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | nvkm/engine/disp/sornv50.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/nvkm/engine/disp/sornv50.c b/nvkm/engine/disp/sornv50.c index ab1e9184..526b7524 100644 --- a/nvkm/engine/disp/sornv50.c +++ b/nvkm/engine/disp/sornv50.c @@ -47,14 +47,8 @@ int nv50_sor_mthd(struct nouveau_object *object, u32 mthd, void *args, u32 size) { struct nv50_disp_priv *priv = (void *)object->engine; - struct nouveau_bios *bios = nouveau_bios(priv); - const u16 type = (mthd & NV50_DISP_SOR_MTHD_TYPE) >> 12; const u8 head = (mthd & NV50_DISP_SOR_MTHD_HEAD) >> 3; - const u8 link = (mthd & NV50_DISP_SOR_MTHD_LINK) >> 2; const u8 or = (mthd & NV50_DISP_SOR_MTHD_OR); - const u16 mask = (0x0100 << head) | (0x0040 << link) | (0x0001 << or); - struct dcb_output outp; - u8 ver, hdr; u32 data; int ret = -EINVAL; @@ -62,8 +56,6 @@ nv50_sor_mthd(struct nouveau_object *object, u32 mthd, void *args, u32 size) return -EINVAL; data = *(u32 *)args; - if (type && !dcb_outp_match(bios, type, mask, &ver, &hdr, &outp)) - return -ENODEV; switch (mthd & ~0x3f) { case NV50_DISP_SOR_PWR: |