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

Commit 8e9e3d2d authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nv84/disp: move hdmi control into core 



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

drivers/gpu/drm/nouveau/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -140,6 +140,8 @@ nouveau-y += core/engine/disp/nve0.o 
nouveau-y += core/engine/disp/dacnv50.o

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

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

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

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

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

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

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

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

0 → 100644
+66 −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

nv84_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, 0x6165a4 + hoff, 0x40000000, 0x00000000);

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

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

		return 0;

	}



	/* AVI InfoFrame */

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

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

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

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

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

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

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



	/* Audio InfoFrame */

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

	nv_wr32(priv, 0x616508 + hoff, 0x000a0184);

	nv_wr32(priv, 0x61650c + hoff, 0x00000071);

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

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



	/* ??? */

	nv_mask(priv, 0x61733c, 0x00100000, 0x00100000); /* RESETF */

	nv_mask(priv, 0x61733c, 0x10000000, 0x10000000); /* LOOKUP_EN */

	nv_mask(priv, 0x61733c, 0x00100000, 0x00000000); /* !RESETF */



	/* HDMI_CTRL */

	nv_mask(priv, 0x6165a4 + hoff, 0x5f1f007f, data | 0x1f000000 /* ??? */);

	return 0;

}

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

0 → 100644
+66 −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

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

{

	const u32 soff = (or * 0x800);



	if (!(data & NV84_DISP_SOR_HDMI_PWR_STATE_ON)) {

		nv_mask(priv, 0x61c5a4 + soff, 0x40000000, 0x00000000);

		nv_mask(priv, 0x61c520 + soff, 0x00000001, 0x00000000);

		nv_mask(priv, 0x61c500 + soff, 0x00000001, 0x00000000);

		return 0;

	}



	/* AVI InfoFrame */

	nv_mask(priv, 0x61c520 + soff, 0x00000001, 0x00000000);

	nv_wr32(priv, 0x61c528 + soff, 0x000d0282);

	nv_wr32(priv, 0x61c52c + soff, 0x0000006f);

	nv_wr32(priv, 0x61c530 + soff, 0x00000000);

	nv_wr32(priv, 0x61c534 + soff, 0x00000000);

	nv_wr32(priv, 0x61c538 + soff, 0x00000000);

	nv_mask(priv, 0x61c520 + soff, 0x00000001, 0x00000001);



	/* Audio InfoFrame */

	nv_mask(priv, 0x61c500 + soff, 0x00000001, 0x00000000);

	nv_wr32(priv, 0x61c508 + soff, 0x000a0184);

	nv_wr32(priv, 0x61c50c + soff, 0x00000071);

	nv_wr32(priv, 0x61c510 + soff, 0x00000000);

	nv_mask(priv, 0x61c500 + soff, 0x00000001, 0x00000001);



	/* ??? */

	nv_mask(priv, 0x61733c, 0x00100000, 0x00100000); /* RESETF */

	nv_mask(priv, 0x61733c, 0x10000000, 0x10000000); /* LOOKUP_EN */

	nv_mask(priv, 0x61733c, 0x00100000, 0x00000000); /* !RESETF */



	/* HDMI_CTRL */

	nv_mask(priv, 0x61c5a4 + soff, 0x5f1f007f, data | 0x1f000000 /* ??? */);

	return 0;

}

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

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ int nv50_dac_sense(struct nv50_disp_priv *, int, u32); 
int nva3_hda_eld(struct nv50_disp_priv *, int, u8 *, u32);

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



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

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

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



int nv50_sor_mthd(struct nouveau_object *, u32, void *, u32);

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

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ nv84_disp_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	priv->dac.power = nv50_dac_power;

	priv->dac.sense = nv50_dac_sense;

	priv->sor.power = nv50_sor_power;

	priv->sor.hdmi = nv84_hdmi_ctrl;



	INIT_LIST_HEAD(&priv->base.vblank.list);

	spin_lock_init(&priv->base.vblank.lock);