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

Commit 1c30cd09 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nvd0/disp: move HDMI control to core 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 0a9e2b95

drivers/gpu/drm/nouveau/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ nouveau-y += core/engine/disp/nvd0.o 
nouveau-y += core/engine/disp/nve0.o

nouveau-y += core/engine/disp/dacnv50.o

nouveau-y += core/engine/disp/hdanvd0.o

nouveau-y += core/engine/disp/hdminvd0.o

nouveau-y += core/engine/disp/sornv50.o

nouveau-y += core/engine/disp/sornvd0.o

nouveau-y += core/engine/disp/vga.o

drivers/gpu/drm/nouveau/core/engine/disp/hdminvd0.c

0 → 100644
+62 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2012 Red Hat Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 * Authors: Ben Skeggs

 */



#include <core/os.h>

#include <core/class.h>



#include "nv50.h"



int

nvd0_hdmi_ctrl(struct nv50_disp_priv *priv, int head, int or, u32 data)

{

	const u32 hoff = (head * 0x800);



	if (!(data & NV84_DISP_SOR_HDMI_PWR_STATE_ON)) {

		nv_mask(priv, 0x616798 + hoff, 0x40000000, 0x00000000);

		nv_mask(priv, 0x6167a4 + hoff, 0x00000001, 0x00000000);

		nv_mask(priv, 0x616714 + hoff, 0x00000001, 0x00000000);

		return 0;

	}



	/* AVI InfoFrame */

	nv_mask(priv, 0x616714 + hoff, 0x00000001, 0x00000000);

	nv_wr32(priv, 0x61671c + hoff, 0x000d0282);

	nv_wr32(priv, 0x616720 + hoff, 0x0000006f);

	nv_wr32(priv, 0x616724 + hoff, 0x00000000);

	nv_wr32(priv, 0x616728 + hoff, 0x00000000);

	nv_wr32(priv, 0x61672c + hoff, 0x00000000);

	nv_mask(priv, 0x616714 + hoff, 0x00000001, 0x00000001);



	/* ??? InfoFrame? */

	nv_mask(priv, 0x6167a4 + hoff, 0x00000001, 0x00000000);

	nv_wr32(priv, 0x6167ac + hoff, 0x00000010);

	nv_mask(priv, 0x6167a4 + hoff, 0x00000001, 0x00000001);



	/* HDMI_CTRL */

	nv_mask(priv, 0x616798 + hoff, 0x401f007f, data);



	/* NFI, audio doesn't work without it though.. */

	nv_mask(priv, 0x616548 + hoff, 0x00000070, 0x00000000);

	return 0;

}

drivers/gpu/drm/nouveau/core/engine/disp/nv50.h

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ struct nv50_disp_priv { 
		int nr;

		int (*power)(struct nv50_disp_priv *, int sor, u32 data);

		int (*hda_eld)(struct nv50_disp_priv *, int sor, u8 *, u32);

		int (*hdmi)(struct nv50_disp_priv *, int head, int sor, u32);

		int (*dp_train)(struct nv50_disp_priv *, int sor, int link,

				u16 type, u16 mask, u32 data,

				struct dcb_output *);
@@ -52,6 +53,8 @@ int nv50_sor_power(struct nv50_disp_priv *, int, u32); 


int nvd0_hda_eld(struct nv50_disp_priv *, int, u8 *, u32);



int nvd0_hdmi_ctrl(struct nv50_disp_priv *, int, int, u32);



int nvd0_sor_dp_train(struct nv50_disp_priv *, int, int, u16, u16, u32,

		      struct dcb_output *);

int nvd0_sor_dp_lnkctl(struct nv50_disp_priv *, int, int, int, u16, u16, u32,

drivers/gpu/drm/nouveau/core/engine/disp/nva3.c

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ struct nouveau_omthds 
nva3_disp_base_omthds[] = {

	{ SOR_MTHD(NV50_DISP_SOR_PWR)         , nv50_sor_mthd },

	{ SOR_MTHD(NVA3_DISP_SOR_HDA_ELD)     , nv50_sor_mthd },

	{ SOR_MTHD(NV84_DISP_SOR_HDMI_PWR)    , nv50_sor_mthd },

	{ SOR_MTHD(NV94_DISP_SOR_DP_TRAIN)    , nv50_sor_mthd },

	{ SOR_MTHD(NV94_DISP_SOR_DP_LNKCTL)   , nv50_sor_mthd },

	{ SOR_MTHD(NV94_DISP_SOR_DP_DRVCTL(0)), nv50_sor_mthd },

drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c

+1 −0
Original line number Diff line number Diff line
@@ -900,6 +900,7 @@ nvd0_disp_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	priv->dac.sense = nv50_dac_sense;

	priv->sor.power = nv50_sor_power;

	priv->sor.hda_eld = nvd0_hda_eld;

	priv->sor.hdmi = nvd0_hdmi_ctrl;

	priv->sor.dp_train = nvd0_sor_dp_train;

	priv->sor.dp_lnkctl = nvd0_sor_dp_lnkctl;

	priv->sor.dp_drvctl = nvd0_sor_dp_drvctl;