Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02d786cc authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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: default avatarBen Skeggs <bskeggs@redhat.com>
parent 01a97637

drivers/gpu/drm/nouveau/include/nvif/cl5070.h

+0 −7
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c

+0 −24
Original line number Diff line number Diff line
@@ -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 {