Commit af2922fa authored by Dave Airlie's avatar Dave Airlie
Browse files

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



Nothing too major here, I actually thought I'd sent most of these
right before the new year, but that apparently got lost in the bustle:
- Turing MMU fault recovery fixes
- Fix mDP connectors being reported as eDP to userspace
- Fixes for audio locking, and other bit-rot from DRM changes since
atomic support was written
- Misc other minor fixes.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv7yLfhuVbYa-4g0vxVt93OaC7Sodiz2R-TDHu-MoofEdw@mail.gmail.com
parents 32c3d9b0 d1f5a3fc

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

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ core507d_update(struct nv50_core *core, u32 *interlock, bool ntfy) 
	struct nvif_push *push = core->chan.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 5)))

	if ((ret = PUSH_WAIT(push, (ntfy ? 2 : 0) + 3)))

		return ret;



	if (ntfy) {

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

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ corec37d_update(struct nv50_core *core, u32 *interlock, bool ntfy) 
	struct nvif_push *push = core->chan.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 9)))

	if ((ret = PUSH_WAIT(push, (ntfy ? 2 * 2 : 0) + 5)))

		return ret;



	if (ntfy) {

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

+130 −100
Original line number Diff line number Diff line
@@ -220,6 +220,10 @@ nv50_dmac_wait(struct nvif_push *push, u32 size) 
	return 0;

}



MODULE_PARM_DESC(kms_vram_pushbuf, "Place EVO/NVD push buffers in VRAM (default: auto)");

static int nv50_dmac_vram_pushbuf = -1;

module_param_named(kms_vram_pushbuf, nv50_dmac_vram_pushbuf, int, 0400);



int

nv50_dmac_create(struct nvif_device *device, struct nvif_object *disp,

		 const s32 *oclass, u8 head, void *data, u32 size, s64 syncbuf,
@@ -241,7 +245,8 @@ nv50_dmac_create(struct nvif_device *device, struct nvif_object *disp, 
	 *

	 * This appears to match NVIDIA's behaviour on Pascal.

	 */

	if (device->info.family == NV_DEVICE_INFO_V0_PASCAL)

	if ((nv50_dmac_vram_pushbuf > 0) ||

	    (nv50_dmac_vram_pushbuf < 0 && device->info.family == NV_DEVICE_INFO_V0_PASCAL))

		type |= NVIF_MEM_VRAM;



	ret = nvif_mem_ctor_map(&cli->mmu, "kmsChanPush", type, 0x1000,
@@ -304,6 +309,14 @@ nv50_dmac_create(struct nvif_device *device, struct nvif_object *disp, 
/******************************************************************************

 * Output path helpers

 *****************************************************************************/

static void

nv50_outp_dump_caps(struct nouveau_drm *drm,

		    struct nouveau_encoder *outp)

{

	NV_DEBUG(drm, "%s caps: dp_interlace=%d\n",

		 outp->base.base.name, outp->caps.dp_interlace);

}



static void

nv50_outp_release(struct nouveau_encoder *nv_encoder)

{
@@ -419,8 +432,7 @@ nv50_outp_atomic_check(struct drm_encoder *encoder, 
}



struct nouveau_connector *

nv50_outp_get_new_connector(struct nouveau_encoder *outp,

			    struct drm_atomic_state *state)

nv50_outp_get_new_connector(struct drm_atomic_state *state, struct nouveau_encoder *outp)

{

	struct drm_connector *connector;

	struct drm_connector_state *connector_state;
@@ -436,8 +448,7 @@ nv50_outp_get_new_connector(struct nouveau_encoder *outp, 
}



struct nouveau_connector *

nv50_outp_get_old_connector(struct nouveau_encoder *outp,

			    struct drm_atomic_state *state)

nv50_outp_get_old_connector(struct drm_atomic_state *state, struct nouveau_encoder *outp)

{

	struct drm_connector *connector;

	struct drm_connector_state *connector_state;
@@ -452,27 +463,44 @@ nv50_outp_get_old_connector(struct nouveau_encoder *outp, 
	return NULL;

}



static struct nouveau_crtc *

nv50_outp_get_new_crtc(const struct drm_atomic_state *state, const struct nouveau_encoder *outp)

{

	struct drm_crtc *crtc;

	struct drm_crtc_state *crtc_state;

	const u32 mask = drm_encoder_mask(&outp->base.base);

	int i;



	for_each_new_crtc_in_state(state, crtc, crtc_state, i) {

		if (crtc_state->encoder_mask & mask)

			return nouveau_crtc(crtc);

	}



	return NULL;

}



/******************************************************************************

 * DAC

 *****************************************************************************/

static void

nv50_dac_disable(struct drm_encoder *encoder, struct drm_atomic_state *state)

nv50_dac_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *state)

{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

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

	const u32 ctrl = NVDEF(NV507D, DAC_SET_CONTROL, OWNER, NONE);

	if (nv_encoder->crtc)



	core->func->dac->ctrl(core, nv_encoder->or, ctrl, NULL);

	nv_encoder->crtc = NULL;

	nv50_outp_release(nv_encoder);

}



static void

nv50_dac_enable(struct drm_encoder *encoder, struct drm_atomic_state *state)

nv50_dac_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *state)

{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

	struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder->crtc);

	struct nv50_head_atom *asyh = nv50_head_atom(nv_crtc->base.state);

	struct nouveau_crtc *nv_crtc = nv50_outp_get_new_crtc(state, nv_encoder);

	struct nv50_head_atom *asyh =

		nv50_head_atom(drm_atomic_get_new_crtc_state(state, &nv_crtc->base));

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

	u32 ctrl = 0;
@@ -493,7 +521,7 @@ nv50_dac_enable(struct drm_encoder *encoder, struct drm_atomic_state *state) 
	core->func->dac->ctrl(core, nv_encoder->or, ctrl, asyh);

	asyh->or.depth = 0;



	nv_encoder->crtc = encoder->crtc;

	nv_encoder->crtc = &nv_crtc->base;

}



static enum drm_connector_status
@@ -526,8 +554,8 @@ nv50_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector) 
static const struct drm_encoder_helper_funcs

nv50_dac_help = {

	.atomic_check = nv50_outp_atomic_check,

	.atomic_enable = nv50_dac_enable,

	.atomic_disable = nv50_dac_disable,

	.atomic_enable = nv50_dac_atomic_enable,

	.atomic_disable = nv50_dac_atomic_disable,

	.detect = nv50_dac_detect

};
@@ -593,34 +621,27 @@ nv50_audio_component_get_eld(struct device *kdev, int port, int dev_id, 
	struct nouveau_drm *drm = nouveau_drm(drm_dev);

	struct drm_encoder *encoder;

	struct nouveau_encoder *nv_encoder;

	struct drm_connector *connector;

	struct nouveau_crtc *nv_crtc;

	struct drm_connector_list_iter conn_iter;

	int ret = 0;



	*enabled = false;



	mutex_lock(&drm->audio.lock);



	drm_for_each_encoder(encoder, drm->dev) {

		struct nouveau_connector *nv_connector = NULL;



		if (encoder->encoder_type == DRM_MODE_ENCODER_DPMST)

			continue; /* TODO */



		nv_encoder = nouveau_encoder(encoder);

		nv_connector = nouveau_connector(nv_encoder->audio.connector);

		nv_crtc = nouveau_crtc(nv_encoder->crtc);



		drm_connector_list_iter_begin(drm_dev, &conn_iter);

		drm_for_each_connector_iter(connector, &conn_iter) {

			if (connector->state->best_encoder == encoder) {

				nv_connector = nouveau_connector(connector);

				break;

			}

		}

		drm_connector_list_iter_end(&conn_iter);

		if (!nv_connector)

		if (!nv_crtc || nv_encoder->or != port || nv_crtc->index != dev_id)

			continue;



		nv_crtc = nouveau_crtc(encoder->crtc);

		if (!nv_crtc || nv_encoder->or != port ||

		    nv_crtc->index != dev_id)

			continue;

		*enabled = nv_encoder->audio;

		*enabled = nv_encoder->audio.enabled;

		if (*enabled) {

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

			memcpy(buf, nv_connector->base.eld,
@@ -629,6 +650,8 @@ nv50_audio_component_get_eld(struct device *kdev, int port, int dev_id, 
		break;

	}



	mutex_unlock(&drm->audio.lock);



	return ret;

}
@@ -678,17 +701,22 @@ static const struct component_ops nv50_audio_component_bind_ops = { 
static void

nv50_audio_component_init(struct nouveau_drm *drm)

{

	if (!component_add(drm->dev->dev, &nv50_audio_component_bind_ops))

	if (component_add(drm->dev->dev, &nv50_audio_component_bind_ops))

		return;



	drm->audio.component_registered = true;

	mutex_init(&drm->audio.lock);

}



static void

nv50_audio_component_fini(struct nouveau_drm *drm)

{

	if (drm->audio.component_registered) {

	if (!drm->audio.component_registered)

		return;



	component_del(drm->dev->dev, &nv50_audio_component_bind_ops);

	drm->audio.component_registered = false;

	}

	mutex_destroy(&drm->audio.lock);

}



/******************************************************************************
@@ -711,24 +739,25 @@ nv50_audio_disable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc) 
				(0x0100 << nv_crtc->index),

	};



	if (!nv_encoder->audio)

		return;



	nv_encoder->audio = false;

	mutex_lock(&drm->audio.lock);

	if (nv_encoder->audio.enabled) {

		nv_encoder->audio.enabled = false;

		nv_encoder->audio.connector = NULL;

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

	}

	mutex_unlock(&drm->audio.lock);



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

					nv_crtc->index);

}



static void

nv50_audio_enable(struct drm_encoder *encoder, struct drm_atomic_state *state,

nv50_audio_enable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc,

		  struct nouveau_connector *nv_connector, struct drm_atomic_state *state,

		  struct drm_display_mode *mode)

{

	struct nouveau_drm *drm = nouveau_drm(encoder->dev);

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

	struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder->crtc);

	struct nouveau_connector *nv_connector;

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

	struct __packed {

		struct {
@@ -744,15 +773,19 @@ nv50_audio_enable(struct drm_encoder *encoder, struct drm_atomic_state *state, 
				     (0x0100 << nv_crtc->index),

	};



	nv_connector = nv50_outp_get_new_connector(nv_encoder, state);

	if (!drm_detect_monitor_audio(nv_connector->edid))

		return;



	mutex_lock(&drm->audio.lock);



	memcpy(args.data, nv_connector->base.eld, sizeof(args.data));



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

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

	nv_encoder->audio = true;

	nv_encoder->audio.enabled = true;

	nv_encoder->audio.connector = &nv_connector->base;



	mutex_unlock(&drm->audio.lock);



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

					nv_crtc->index);
@@ -781,12 +814,12 @@ nv50_hdmi_disable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc) 
}



static void

nv50_hdmi_enable(struct drm_encoder *encoder, struct drm_atomic_state *state,

nv50_hdmi_enable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc,

		 struct nouveau_connector *nv_connector, struct drm_atomic_state *state,

		 struct drm_display_mode *mode)

{

	struct nouveau_drm *drm = nouveau_drm(encoder->dev);

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

	struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder->crtc);

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

	struct {

		struct nv50_disp_mthd_v1 base;
@@ -801,7 +834,6 @@ nv50_hdmi_enable(struct drm_encoder *encoder, struct drm_atomic_state *state, 
		.pwr.state = 1,

		.pwr.rekey = 56, /* binary driver, and tegra, constant */

	};

	struct nouveau_connector *nv_connector;

	struct drm_hdmi_info *hdmi;

	u32 max_ac_packet;

	union hdmi_infoframe avi_frame;
@@ -811,7 +843,6 @@ nv50_hdmi_enable(struct drm_encoder *encoder, struct drm_atomic_state *state, 
	int ret;

	int size;



	nv_connector = nv50_outp_get_new_connector(nv_encoder, state);

	if (!drm_detect_hdmi_monitor(nv_connector->edid))

		return;
@@ -857,7 +888,7 @@ nv50_hdmi_enable(struct drm_encoder *encoder, struct drm_atomic_state *state, 
		+ args.pwr.vendor_infoframe_length;

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



	nv50_audio_enable(encoder, state, mode);

	nv50_audio_enable(encoder, nv_crtc, nv_connector, state, mode);



	/* If SCDC is supported by the downstream monitor, update

	 * divider / scrambling settings to what we programmed above.
@@ -898,6 +929,7 @@ struct nv50_mstc { 
struct nv50_msto {

	struct drm_encoder encoder;



	/* head is statically assigned on msto creation */

	struct nv50_head *head;

	struct nv50_mstc *mstc;

	bool disabled;
@@ -1056,11 +1088,12 @@ nv50_dp_bpc_to_depth(unsigned int bpc) 
}



static void

nv50_msto_enable(struct drm_encoder *encoder, struct drm_atomic_state *state)

nv50_msto_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *state)

{

	struct nv50_head *head = nv50_head(encoder->crtc);

	struct nv50_head_atom *armh = nv50_head_atom(head->base.base.state);

	struct nv50_msto *msto = nv50_msto(encoder);

	struct nv50_head *head = msto->head;

	struct nv50_head_atom *asyh =

		nv50_head_atom(drm_atomic_get_new_crtc_state(state, &head->base.base));

	struct nv50_mstc *mstc = NULL;

	struct nv50_mstm *mstm = NULL;

	struct drm_connector *connector;
@@ -1081,8 +1114,7 @@ nv50_msto_enable(struct drm_encoder *encoder, struct drm_atomic_state *state) 
	if (WARN_ON(!mstc))

		return;



	r = drm_dp_mst_allocate_vcpi(&mstm->mgr, mstc->port, armh->dp.pbn,

				     armh->dp.tu);

	r = drm_dp_mst_allocate_vcpi(&mstm->mgr, mstc->port, asyh->dp.pbn, asyh->dp.tu);

	if (!r)

		DRM_DEBUG_KMS("Failed to allocate VCPI\n");
@@ -1094,15 +1126,15 @@ nv50_msto_enable(struct drm_encoder *encoder, struct drm_atomic_state *state) 
	else

		proto = NV917D_SOR_SET_CONTROL_PROTOCOL_DP_B;



	mstm->outp->update(mstm->outp, head->base.index, armh, proto,

			   nv50_dp_bpc_to_depth(armh->or.bpc));

	mstm->outp->update(mstm->outp, head->base.index, asyh, proto,

			   nv50_dp_bpc_to_depth(asyh->or.bpc));



	msto->mstc = mstc;

	mstm->modified = true;

}



static void

nv50_msto_disable(struct drm_encoder *encoder, struct drm_atomic_state *state)

nv50_msto_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *state)

{

	struct nv50_msto *msto = nv50_msto(encoder);

	struct nv50_mstc *mstc = msto->mstc;
@@ -1119,8 +1151,8 @@ nv50_msto_disable(struct drm_encoder *encoder, struct drm_atomic_state *state) 


static const struct drm_encoder_helper_funcs

nv50_msto_help = {

	.atomic_disable = nv50_msto_disable,

	.atomic_enable = nv50_msto_enable,

	.atomic_disable = nv50_msto_atomic_disable,

	.atomic_enable = nv50_msto_atomic_enable,

	.atomic_check = nv50_msto_atomic_check,

};
@@ -1616,17 +1648,11 @@ nv50_sor_update(struct nouveau_encoder *nv_encoder, u8 head, 
}



static void

nv50_sor_disable(struct drm_encoder *encoder,

		 struct drm_atomic_state *state)

nv50_sor_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *state)

{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

	struct nouveau_crtc *nv_crtc = nouveau_crtc(nv_encoder->crtc);

	struct nouveau_connector *nv_connector =

		nv50_outp_get_old_connector(nv_encoder, state);



	nv_encoder->crtc = NULL;



	if (nv_crtc) {

	struct nouveau_connector *nv_connector = nv50_outp_get_old_connector(state, nv_encoder);

	struct drm_dp_aux *aux = &nv_connector->aux;

	u8 pwr;
@@ -1644,15 +1670,16 @@ nv50_sor_disable(struct drm_encoder *encoder, 
	nv50_audio_disable(encoder, nv_crtc);

	nv50_hdmi_disable(&nv_encoder->base.base, nv_crtc);

	nv50_outp_release(nv_encoder);

	}

	nv_encoder->crtc = NULL;

}



static void

nv50_sor_enable(struct drm_encoder *encoder, struct drm_atomic_state *state)

nv50_sor_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *state)

{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

	struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder->crtc);

	struct nv50_head_atom *asyh = nv50_head_atom(nv_crtc->base.state);

	struct nouveau_crtc *nv_crtc = nv50_outp_get_new_crtc(state, nv_encoder);

	struct nv50_head_atom *asyh =

		nv50_head_atom(drm_atomic_get_new_crtc_state(state, &nv_crtc->base));

	struct drm_display_mode *mode = &asyh->state.adjusted_mode;

	struct {

		struct nv50_disp_mthd_v1 base;
@@ -1672,8 +1699,8 @@ nv50_sor_enable(struct drm_encoder *encoder, struct drm_atomic_state *state) 
	u8 proto = NV507D_SOR_SET_CONTROL_PROTOCOL_CUSTOM;

	u8 depth = NV837D_SOR_SET_CONTROL_PIXEL_DEPTH_DEFAULT;



	nv_connector = nv50_outp_get_new_connector(nv_encoder, state);

	nv_encoder->crtc = encoder->crtc;

	nv_connector = nv50_outp_get_new_connector(state, nv_encoder);

	nv_encoder->crtc = &nv_crtc->base;



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

	     disp->disp->object.oclass >= GF110_DISP) &&
@@ -1699,7 +1726,7 @@ nv50_sor_enable(struct drm_encoder *encoder, struct drm_atomic_state *state) 
			proto = NV507D_SOR_SET_CONTROL_PROTOCOL_SINGLE_TMDS_B;

		}



		nv50_hdmi_enable(&nv_encoder->base.base, state, mode);

		nv50_hdmi_enable(&nv_encoder->base.base, nv_crtc, nv_connector, state, mode);

		break;

	case DCB_OUTPUT_LVDS:

		proto = NV507D_SOR_SET_CONTROL_PROTOCOL_LVDS_CUSTOM;
@@ -1740,7 +1767,7 @@ nv50_sor_enable(struct drm_encoder *encoder, struct drm_atomic_state *state) 
		else

			proto = NV887D_SOR_SET_CONTROL_PROTOCOL_DP_B;



		nv50_audio_enable(encoder, state, mode);

		nv50_audio_enable(encoder, nv_crtc, nv_connector, state, mode);

		break;

	default:

		BUG();
@@ -1753,8 +1780,8 @@ nv50_sor_enable(struct drm_encoder *encoder, struct drm_atomic_state *state) 
static const struct drm_encoder_helper_funcs

nv50_sor_help = {

	.atomic_check = nv50_outp_atomic_check,

	.atomic_enable = nv50_sor_enable,

	.atomic_disable = nv50_sor_disable,

	.atomic_enable = nv50_sor_atomic_enable,

	.atomic_disable = nv50_sor_atomic_disable,

};



static void
@@ -1821,6 +1848,7 @@ nv50_sor_create(struct drm_connector *connector, struct dcb_output *dcbe) 
	drm_connector_attach_encoder(connector, encoder);



	disp->core->func->sor->get_caps(disp, nv_encoder, ffs(dcbe->or) - 1);

	nv50_outp_dump_caps(drm, nv_encoder);



	if (dcbe->type == DCB_OUTPUT_DP) {

		struct nvkm_i2c_aux *aux =
@@ -1875,23 +1903,24 @@ nv50_pior_atomic_check(struct drm_encoder *encoder, 
}



static void

nv50_pior_disable(struct drm_encoder *encoder, struct drm_atomic_state *state)

nv50_pior_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *state)

{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

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

	const u32 ctrl = NVDEF(NV507D, PIOR_SET_CONTROL, OWNER, NONE);

	if (nv_encoder->crtc)



	core->func->pior->ctrl(core, nv_encoder->or, ctrl, NULL);

	nv_encoder->crtc = NULL;

	nv50_outp_release(nv_encoder);

}



static void

nv50_pior_enable(struct drm_encoder *encoder, struct drm_atomic_state *state)

nv50_pior_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *state)

{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

	struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder->crtc);

	struct nv50_head_atom *asyh = nv50_head_atom(nv_crtc->base.state);

	struct nouveau_crtc *nv_crtc = nv50_outp_get_new_crtc(state, nv_encoder);

	struct nv50_head_atom *asyh =

		nv50_head_atom(drm_atomic_get_new_crtc_state(state, &nv_crtc->base));

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

	u32 ctrl = 0;
@@ -1929,8 +1958,8 @@ nv50_pior_enable(struct drm_encoder *encoder, struct drm_atomic_state *state) 
static const struct drm_encoder_helper_funcs

nv50_pior_help = {

	.atomic_check = nv50_pior_atomic_check,

	.atomic_enable = nv50_pior_enable,

	.atomic_disable = nv50_pior_disable,

	.atomic_enable = nv50_pior_atomic_enable,

	.atomic_disable = nv50_pior_atomic_disable,

};



static void
@@ -1991,6 +2020,7 @@ nv50_pior_create(struct drm_connector *connector, struct dcb_output *dcbe) 
	drm_connector_attach_encoder(connector, encoder);



	disp->core->func->pior->get_caps(disp, nv_encoder, ffs(dcbe->or) - 1);

	nv50_outp_dump_caps(drm, nv_encoder);



	return 0;

}

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

+2 −9
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ head907d_mode(struct nv50_head *head, struct nv50_head_atom *asyh) 
	const int i = head->base.index;

	int ret;



	if ((ret = PUSH_WAIT(push, 14)))

	if ((ret = PUSH_WAIT(push, 13)))

		return ret;



	PUSH_MTHD(push, NV907D, HEAD_SET_OVERSCAN_COLOR(i),
@@ -353,14 +353,7 @@ head907d_mode(struct nv50_head *head, struct nv50_head_atom *asyh) 
	PUSH_MTHD(push, NV907D, HEAD_SET_DEFAULT_BASE_COLOR(i),

		  NVVAL(NV907D, HEAD_SET_DEFAULT_BASE_COLOR, RED, 0) |

		  NVVAL(NV907D, HEAD_SET_DEFAULT_BASE_COLOR, GREEN, 0) |

		  NVVAL(NV907D, HEAD_SET_DEFAULT_BASE_COLOR, BLUE, 0),



				HEAD_SET_CRC_CONTROL(i),

		  NVDEF(NV907D, HEAD_SET_CRC_CONTROL, CONTROLLING_CHANNEL, CORE) |

		  NVDEF(NV907D, HEAD_SET_CRC_CONTROL, EXPECT_BUFFER_COLLAPSE, FALSE) |

		  NVDEF(NV907D, HEAD_SET_CRC_CONTROL, TIMESTAMP_MODE, FALSE) |

		  NVDEF(NV907D, HEAD_SET_CRC_CONTROL, PRIMARY_OUTPUT, NONE) |

		  NVDEF(NV907D, HEAD_SET_CRC_CONTROL, SECONDARY_OUTPUT, NONE));

		  NVVAL(NV907D, HEAD_SET_DEFAULT_BASE_COLOR, BLUE, 0));



	PUSH_MTHD(push, NV907D, HEAD_SET_PIXEL_CLOCK_FREQUENCY(i),

		  NVVAL(NV907D, HEAD_SET_PIXEL_CLOCK_FREQUENCY, HERTZ, m->clock * 1000) |

drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ enum dcb_connector_type { 
	DCB_CONNECTOR_LVDS_SPWG = 0x41,

	DCB_CONNECTOR_DP = 0x46,

	DCB_CONNECTOR_eDP = 0x47,

	DCB_CONNECTOR_mDP = 0x48,

	DCB_CONNECTOR_HDMI_0 = 0x60,

	DCB_CONNECTOR_HDMI_1 = 0x61,

	DCB_CONNECTOR_HDMI_C = 0x63,