|
@@ -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:
|