Commit dfc4005f authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

drm/nouveau/disp: move DAC load detection method 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 1b255f1c

drivers/gpu/drm/nouveau/dispnv50/disp.c

+6 −15
Original line number Diff line number Diff line
@@ -529,24 +529,15 @@ static enum drm_connector_status 
nv50_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector)

{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

	struct nv50_disp *disp = nv50_disp(encoder->dev);

	struct {

		struct nv50_disp_mthd_v1 base;

		struct nv50_disp_dac_load_v0 load;

	} args = {

		.base.version = 1,

		.base.method = NV50_DISP_MTHD_V1_DAC_LOAD,

		.base.hasht  = nv_encoder->dcb->hasht,

		.base.hashm  = nv_encoder->dcb->hashm,

	};

	u32 loadval;

	int ret;



	args.load.data = nouveau_drm(encoder->dev)->vbios.dactestval;

	if (args.load.data == 0)

		args.load.data = 340;

	loadval = nouveau_drm(encoder->dev)->vbios.dactestval;

	if (loadval == 0)

		loadval = 340;



	ret = nvif_mthd(&disp->disp->object, 0, &args, sizeof(args));

	if (ret || !args.load.load)

	ret = nvif_outp_load_detect(&nv_encoder->outp, loadval);

	if (ret <= 0)

		return connector_status_disconnected;



	return connector_status_connected;

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

+0 −8
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ struct nv50_disp_mthd_v1 { 
	__u8  version;

#define NV50_DISP_MTHD_V1_ACQUIRE                                          0x01

#define NV50_DISP_MTHD_V1_RELEASE                                          0x02

#define NV50_DISP_MTHD_V1_DAC_LOAD                                         0x11

#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
@@ -50,13 +49,6 @@ struct nv50_disp_acquire_v0 { 
	__u8  pad04[4];

};



struct nv50_disp_dac_load_v0 {

	__u8  version;

	__u8  load;

	__u8  pad02[2];

	__u32 data;

};



struct nv50_disp_sor_hda_eld_v0 {

	__u8  version;

	__u8  pad01[7];

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

+11 −0
Original line number Diff line number Diff line
@@ -9,4 +9,15 @@ union nvif_outp_args { 
		__u8 pad02[6];

	} v0;

};



#define NVIF_OUTP_V0_LOAD_DETECT 0x00



union nvif_outp_load_detect_args {

	struct nvif_outp_load_detect_v0 {

		__u8  version;

		__u8  load;

		__u8  pad02[2];

		__u32 data; /*TODO: move vbios loadval parsing into nvkm */

	} v0;

};

#endif

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

+1 −0
Original line number Diff line number Diff line
@@ -10,4 +10,5 @@ struct nvif_outp { 


int nvif_outp_ctor(struct nvif_disp *, const char *name, int id, struct nvif_outp *);

void nvif_outp_dtor(struct nvif_outp *);

int nvif_outp_load_detect(struct nvif_outp *, u32 loadval);

#endif

drivers/gpu/drm/nouveau/nvif/outp.c

+14 −0
Original line number Diff line number Diff line
@@ -26,6 +26,20 @@ 
#include <nvif/class.h>

#include <nvif/if0012.h>



int

nvif_outp_load_detect(struct nvif_outp *outp, u32 loadval)

{

	struct nvif_outp_load_detect_v0 args;

	int ret;



	args.version = 0;

	args.data = loadval;



	ret = nvif_mthd(&outp->object, NVIF_OUTP_V0_LOAD_DETECT, &args, sizeof(args));

	NVIF_ERRON(ret, &outp->object, "[LOAD_DETECT data:%08x] load:%02x", args.data, args.load);

	return ret < 0 ? ret : args.load;

}



void

nvif_outp_dtor(struct nvif_outp *outp)

{