drm/nouveau/disp/dp: split link config/power into two steps (1ecee1cd) · Commits · 戴 / test

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,8 @@ dp_set_link_config(struct dp_state *dp)
		return ret;
		}

		impl->lnk_pwr(outp, dp->link_nr);

		/* set desired link configuration on the sink */
		sink[0] = dp->link_bw / 27000;
		sink[1] = dp->link_nr;

+1 −0

Original line number	Diff line number	Diff line
		@@ -203,6 +203,7 @@ extern struct nvkm_output_dp_impl nv50_pior_dp_impl;
		extern struct nouveau_oclass *nv50_disp_outp_sclass[];

		extern struct nvkm_output_dp_impl nv94_sor_dp_impl;
		int nv94_sor_dp_lnk_pwr(struct nvkm_output_dp *, int);
		extern struct nouveau_oclass *nv94_disp_outp_sclass[];

		extern struct nvkm_output_dp_impl nvd0_sor_dp_impl;

+1 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ int _nvkm_output_dp_fini(struct nouveau_object *, bool);
		struct nvkm_output_dp_impl {
		struct nvkm_output_impl base;
		int (pattern)(struct nvkm_output_dp , int);
		int (lnk_pwr)(struct nvkm_output_dp , int nr);
		int (lnk_ctl)(struct nvkm_output_dp , int nr, int bw, bool ef);
		int (drv_ctl)(struct nvkm_output_dp , int ln, int vs, int pe, int pc);
		};

+7 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,12 @@ nv50_pior_dp_pattern(struct nvkm_output_dp *outp, int pattern)
		return port ? 0 : -ENODEV;
		}

		static int
		nv50_pior_dp_lnk_pwr(struct nvkm_output_dp *outp, int nr)
		{
		return 0;
		}

		static int
		nv50_pior_dp_lnk_ctl(struct nvkm_output_dp *outp, int nr, int bw, bool ef)
		{
		@@ -127,6 +133,7 @@ nv50_pior_dp_impl = {
		.fini = _nvkm_output_dp_fini,
		},
		.pattern = nv50_pior_dp_pattern,
		.lnk_pwr = nv50_pior_dp_lnk_pwr,
		.lnk_ctl = nv50_pior_dp_lnk_ctl,
		.drv_ctl = nv50_pior_dp_drv_ctl,
		};

+16 −6

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@
		#include <subdev/bios/dcb.h>
		#include <subdev/bios/dp.h>
		#include <subdev/bios/init.h>
		#include <subdev/timer.h>

		#include "nv50.h"
		#include "outpdp.h"
		@@ -64,6 +65,20 @@ nv94_sor_dp_pattern(struct nvkm_output_dp *outp, int pattern)
		return 0;
		}

		int
		nv94_sor_dp_lnk_pwr(struct nvkm_output_dp *outp, int nr)
		{
		struct nv50_disp_priv priv = (void )nouveau_disp(outp);
		const u32 loff = nv94_sor_loff(outp);
		u32 mask = 0, i;

		for (i = 0; i < nr; i++)
		mask \|= 1 << (nv94_sor_dp_lane_map(priv, i) >> 3);

		nv_mask(priv, 0x61c130 + loff, 0x0000000f, mask);
		return 0;
		}

		static int
		nv94_sor_dp_lnk_ctl(struct nvkm_output_dp *outp, int nr, int bw, bool ef)
		{
		@@ -72,8 +87,6 @@ nv94_sor_dp_lnk_ctl(struct nvkm_output_dp *outp, int nr, int bw, bool ef)
		const u32 loff = nv94_sor_loff(outp);
		u32 dpctrl = 0x00000000;
		u32 clksor = 0x00000000;
		u32 lane = 0;
		int i;

		dpctrl \|= ((1 << nr) - 1) << 16;
		if (ef)
		@@ -81,12 +94,8 @@ nv94_sor_dp_lnk_ctl(struct nvkm_output_dp *outp, int nr, int bw, bool ef)
		if (bw > 0x06)
		clksor \|= 0x00040000;

		for (i = 0; i < nr; i++)
		lane \|= 1 << (nv94_sor_dp_lane_map(priv, i) >> 3);

		nv_mask(priv, 0x614300 + soff, 0x000c0000, clksor);
		nv_mask(priv, 0x61c10c + loff, 0x001f4000, dpctrl);
		nv_mask(priv, 0x61c130 + loff, 0x0000000f, lane);
		return 0;
		}

		@@ -132,6 +141,7 @@ nv94_sor_dp_impl = {
		.fini = _nvkm_output_dp_fini,
		},
		.pattern = nv94_sor_dp_pattern,
		.lnk_pwr = nv94_sor_dp_lnk_pwr,
		.lnk_ctl = nv94_sor_dp_lnk_ctl,
		.drv_ctl = nv94_sor_dp_drv_ctl,
		};