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

Commit be83cd4e authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: finalise nvkm namespace switch (no binary change) 



The namespace of NVKM is being changed to nvkm_ instead of nouveau_,
which will be used for the DRM part of the driver.  This is being
done in order to make it very clear as to what part of the driver a
given symbol belongs to, and as a minor step towards splitting the
DRM driver out to be able to stand on its own (for virt).

Because there's already a large amount of churn here anyway, this is
as good a time as any to also switch to NVIDIA's device and chipset
naming to ease collaboration with them.

A comparison of objdump disassemblies proves no code changes.

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

drivers/gpu/drm/nouveau/dispnv04/crtc.c

+3 −3
Original line number Diff line number Diff line
@@ -112,12 +112,12 @@ static void nv_crtc_calc_state_ext(struct drm_crtc *crtc, struct drm_display_mod 
{

	struct drm_device *dev = crtc->dev;

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nouveau_bios *bios = nvxx_bios(&drm->device);

	struct nouveau_clk *clk = nvxx_clk(&drm->device);

	struct nvkm_bios *bios = nvxx_bios(&drm->device);

	struct nvkm_clk *clk = nvxx_clk(&drm->device);

	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);

	struct nv04_mode_state *state = &nv04_display(dev)->mode_reg;

	struct nv04_crtc_reg *regp = &state->crtc_reg[nv_crtc->index];

	struct nouveau_pll_vals *pv = &regp->pllvals;

	struct nvkm_pll_vals *pv = &regp->pllvals;

	struct nvbios_pll pll_lim;



	if (nvbios_pll_parse(bios, nv_crtc->index ? PLL_VPLL1 : PLL_VPLL0,

drivers/gpu/drm/nouveau/dispnv04/dac.c

+11 −11
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ int nv04_dac_output_offset(struct drm_encoder *encoder) 
static int sample_load_twice(struct drm_device *dev, bool sense[2])

{

	struct nvif_device *device = &nouveau_drm(dev)->device;

	struct nouveau_timer *ptimer = nvxx_timer(device);

	struct nvkm_timer *ptimer = nvxx_timer(device);

	int i;



	for (i = 0; i < 2; i++) {
@@ -80,15 +80,15 @@ static int sample_load_twice(struct drm_device *dev, bool sense[2]) 
		 * use a 10ms timeout (guards against crtc being inactive, in

		 * which case blank state would never change)

		 */

		if (!nouveau_timer_wait_eq(ptimer, 10000000,

		if (!nvkm_timer_wait_eq(ptimer, 10000000,

					NV_PRMCIO_INP0__COLOR,

					0x00000001, 0x00000000))

			return -EBUSY;

		if (!nouveau_timer_wait_eq(ptimer, 10000000,

		if (!nvkm_timer_wait_eq(ptimer, 10000000,

					NV_PRMCIO_INP0__COLOR,

					0x00000001, 0x00000001))

			return -EBUSY;

		if (!nouveau_timer_wait_eq(ptimer, 10000000,

		if (!nvkm_timer_wait_eq(ptimer, 10000000,

					NV_PRMCIO_INP0__COLOR,

					0x00000001, 0x00000000))

			return -EBUSY;
@@ -232,7 +232,7 @@ uint32_t nv17_dac_sample_load(struct drm_encoder *encoder) 
	struct drm_device *dev = encoder->dev;

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nvif_device *device = &nouveau_drm(dev)->device;

	struct nouveau_gpio *gpio = nvxx_gpio(device);

	struct nvkm_gpio *gpio = nvxx_gpio(device);

	struct dcb_output *dcb = nouveau_encoder(encoder)->dcb;

	uint32_t sample, testval, regoffset = nv04_dac_output_offset(encoder);

	uint32_t saved_powerctrl_2 = 0, saved_powerctrl_4 = 0, saved_routput,

drivers/gpu/drm/nouveau/dispnv04/dfp.c

+3 −3
Original line number Diff line number Diff line
@@ -623,9 +623,9 @@ static void nv04_tmds_slave_init(struct drm_encoder *encoder) 
	struct drm_device *dev = encoder->dev;

	struct dcb_output *dcb = nouveau_encoder(encoder)->dcb;

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nouveau_i2c *i2c = nvxx_i2c(&drm->device);

	struct nouveau_i2c_port *port = i2c->find(i2c, 2);

	struct nouveau_i2c_board_info info[] = {

	struct nvkm_i2c *i2c = nvxx_i2c(&drm->device);

	struct nvkm_i2c_port *port = i2c->find(i2c, 2);

	struct nvkm_i2c_board_info info[] = {

		{

		    {

		        .type = "sil164",

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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ int 
nv04_display_create(struct drm_device *dev)

{

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nouveau_i2c *i2c = nvxx_i2c(&drm->device);

	struct nvkm_i2c *i2c = nvxx_i2c(&drm->device);

	struct dcb_table *dcb = &drm->vbios.dcb;

	struct drm_connector *connector, *ct;

	struct drm_encoder *encoder;

drivers/gpu/drm/nouveau/dispnv04/disp.h

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct nv04_crtc_reg { 


	/* PRAMDAC regs */

	uint32_t nv10_cursync;

	struct nouveau_pll_vals pllvals;

	struct nvkm_pll_vals pllvals;

	uint32_t ramdac_gen_ctrl;

	uint32_t ramdac_630;

	uint32_t ramdac_634;
@@ -170,7 +170,7 @@ nouveau_bios_run_init_table(struct drm_device *dev, u16 table, 
			    struct dcb_output *outp, int crtc)

{

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nouveau_bios *bios = nvxx_bios(&drm->device);

	struct nvkm_bios *bios = nvxx_bios(&drm->device);

	struct nvbios_init init = {

		.subdev = nv_subdev(bios),

		.bios = bios,