drm/nouveau/disp/dp: remove DP_PWR method

This hasn't been used since atomic.

We may want to re-implement "fast" DPMS at some point, but for now,
this just gets in the way.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl5070.h b/drivers/gpu/drm/nouveau/include/nvif/cl5070.h
index 9d46ebac58a2d65f09e6d2ca6389046eddddf22c..22304cc99f398eb5e626e3b2e89a0f67277cb978 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvif/cl5070.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/cl5070.h
@@ -33,7 +33,6 @@ struct nv50_disp_mthd_v1 {
 #define NV50_DISP_MTHD_V1_SOR_HDA_ELD                                      0x21
 #define NV50_DISP_MTHD_V1_SOR_HDMI_PWR                                     0x22
 #define NV50_DISP_MTHD_V1_SOR_LVDS_SCRIPT                                  0x23
-#define NV50_DISP_MTHD_V1_SOR_DP_PWR                                       0x24
 #define NV50_DISP_MTHD_V1_SOR_DP_MST_LINK                                  0x25
 #define NV50_DISP_MTHD_V1_SOR_DP_MST_VCPI                                  0x26
 #define NV50_DISP_MTHD_V1_PIOR_PWR                                         0x30
@@ -88,12 +87,6 @@ struct nv50_disp_sor_lvds_script_v0 {
        __u8  pad04[4];
 };
 
-struct nv50_disp_sor_dp_pwr_v0 {
-       __u8  version;
-       __u8  state;
-       __u8  pad02[6];
-};
-
 struct nv50_disp_sor_dp_mst_link_v0 {
        __u8  version;
        __u8  state;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
index 609bfae9acbb70fc584ec59a61c236baaaa901e1..b817cb511f353968e83cbae04e38d7b4dc90c7de 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
@@ -124,30 +124,6 @@ nv50_disp_root_mthd_(struct nvkm_object *object, u32 mthd, void *data, u32 size)
                        return ret;
        }
                break;
-       case NV50_DISP_MTHD_V1_SOR_DP_PWR: {
-               struct nvkm_output_dp *outpdp = nvkm_output_dp(outp);
-               union {
-                       struct nv50_disp_sor_dp_pwr_v0 v0;
-               } *args = data;
-               int ret = -ENOSYS;
-               nvif_ioctl(object, "disp sor dp pwr size %d\n", size);
-               if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
-                       nvif_ioctl(object, "disp sor dp pwr vers %d state %d\n",
-                                  args->v0.version, args->v0.state);
-                       if (args->v0.state == 0) {
-                               nvkm_notify_put(&outpdp->irq);
-                               outpdp->func->lnk_pwr(outpdp, 0);
-                               atomic_set(&outpdp->lt.done, 0);
-                               return 0;
-                       } else
-                       if (args->v0.state != 0) {
-                               nvkm_output_dp_train(&outpdp->base, 0);
-                               return 0;
-                       }
-               } else
-                       return ret;
-       }
-               break;
        case NV50_DISP_MTHD_V1_SOR_DP_MST_LINK: {
                struct nvkm_output_dp *outpdp = nvkm_output_dp(outp);
                union {