Commit 3f29eacc authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-5.8' of git://github.com/skeggsb/linux into drm-next 



- HDMI/DP audio HDA fixes
- display hang fix for Volta/Turing
- GK20A regression fix.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ <CACAvsv4PW6tAZY6Uvrhi5OV+4rDXvrtNcoq2w_i35YajByj+ew@mail.gmail.com
parents 9ca1f474 dd67cab5

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

+15 −6
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ nv50_outp_release(struct nouveau_encoder *nv_encoder) 
}



static int

nv50_outp_acquire(struct nouveau_encoder *nv_encoder)

nv50_outp_acquire(struct nouveau_encoder *nv_encoder, bool hda)

{

	struct nouveau_drm *drm = nouveau_drm(nv_encoder->base.base.dev);

	struct nv50_disp *disp = nv50_disp(drm->dev);
@@ -289,6 +289,7 @@ nv50_outp_acquire(struct nouveau_encoder *nv_encoder) 
		.base.method = NV50_DISP_MTHD_V1_ACQUIRE,

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

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

		.info.hda = hda,

	};

	int ret;
@@ -393,7 +394,7 @@ nv50_dac_enable(struct drm_encoder *encoder) 
	struct nv50_head_atom *asyh = nv50_head_atom(nv_crtc->base.state);

	struct nv50_core *core = nv50_disp(encoder->dev)->core;



	nv50_outp_acquire(nv_encoder);

	nv50_outp_acquire(nv_encoder, false);



	core->func->dac->ctrl(core, nv_encoder->or, 1 << nv_crtc->index, asyh);

	asyh->or.depth = 0;
@@ -510,7 +511,7 @@ nv50_audio_component_get_eld(struct device *kdev, int port, int dev_id, 
		if (!nv_connector || !nv_crtc || nv_encoder->or != port ||

		    nv_crtc->index != dev_id)

			continue;

		*enabled = drm_detect_monitor_audio(nv_connector->edid);

		*enabled = nv_encoder->audio;

		if (*enabled) {

			ret = drm_eld_size(nv_connector->base.eld);

			memcpy(buf, nv_connector->base.eld,
@@ -600,6 +601,7 @@ nv50_audio_disable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc) 
				(0x0100 << nv_crtc->index),

	};



	nv_encoder->audio = false;

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



	nv50_audio_component_eld_notify(drm->audio.component, nv_encoder->or,
@@ -636,6 +638,7 @@ nv50_audio_enable(struct drm_encoder *encoder, struct drm_display_mode *mode) 


	nvif_mthd(&disp->disp->object, 0, &args,

		  sizeof(args.base) + drm_eld_size(args.data));

	nv_encoder->audio = true;



	nv50_audio_component_eld_notify(drm->audio.component, nv_encoder->or,

					nv_crtc->index);
@@ -966,7 +969,7 @@ nv50_msto_enable(struct drm_encoder *encoder) 
		DRM_DEBUG_KMS("Failed to allocate VCPI\n");



	if (!mstm->links++)

		nv50_outp_acquire(mstm->outp);

		nv50_outp_acquire(mstm->outp, false /*XXX: MST audio.*/);



	if (mstm->outp->link & 1)

		proto = 0x8;
@@ -1560,12 +1563,18 @@ nv50_sor_enable(struct drm_encoder *encoder) 
	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nouveau_connector *nv_connector;

	struct nvbios *bios = &drm->vbios;

	bool hda = false;

	u8 proto = 0xf;

	u8 depth = 0x0;



	nv_connector = nouveau_encoder_connector_get(nv_encoder);

	nv_encoder->crtc = encoder->crtc;

	nv50_outp_acquire(nv_encoder);



	if ((disp->disp->object.oclass == GT214_DISP ||

	     disp->disp->object.oclass >= GF110_DISP) &&

	    drm_detect_monitor_audio(nv_connector->edid))

		hda = true;

	nv50_outp_acquire(nv_encoder, hda);



	switch (nv_encoder->dcb->type) {

	case DCB_OUTPUT_TMDS:
@@ -1775,7 +1784,7 @@ nv50_pior_enable(struct drm_encoder *encoder) 
	u8 owner = 1 << nv_crtc->index;

	u8 proto;



	nv50_outp_acquire(nv_encoder);

	nv50_outp_acquire(nv_encoder, false);



	switch (asyh->or.bpc) {

	case 10: asyh->or.depth = 0x6; break;

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

+4 −1
Original line number Diff line number Diff line
@@ -192,6 +192,8 @@ nv50_wndw_atomic_check_release(struct nv50_wndw *wndw, 
	wndw->func->release(wndw, asyw, asyh);

	asyw->ntfy.handle = 0;

	asyw->sema.handle = 0;

	asyw->xlut.handle = 0;

	memset(asyw->image.handle, 0x00, sizeof(asyw->image.handle));

}



static int
@@ -519,6 +521,7 @@ nv50_wndw_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state) 
			return PTR_ERR(ctxdma);

		}



		if (asyw->visible)

			asyw->image.handle[0] = ctxdma->object.handle;

	}

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

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ struct nv50_disp_acquire_v0 { 
	__u8  version;

	__u8  or;

	__u8  link;

	__u8  pad03[5];

	__u8  hda;

	__u8  pad04[4];

};



struct nv50_disp_dac_load_v0 {

drivers/gpu/drm/nouveau/nouveau_encoder.h

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ struct nouveau_encoder { 
	 * actually programmed on the hw, not the proposed crtc */

	struct drm_crtc *crtc;

	u32 ctrl;

	bool audio;



	struct drm_display_mode mode;

	int last_dpms;

drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ nvkm-y += nvkm/engine/disp/sorgf119.o 
nvkm-y += nvkm/engine/disp/sorgk104.o

nvkm-y += nvkm/engine/disp/sorgm107.o

nvkm-y += nvkm/engine/disp/sorgm200.o

nvkm-y += nvkm/engine/disp/sorgp100.o

nvkm-y += nvkm/engine/disp/sorgv100.o

nvkm-y += nvkm/engine/disp/sortu102.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE