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

Commit 989aa5b7 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/nvif: namespace of nvkm accessors (no binary change) 



NVKM is having it's namespace switched to nvkm_, which will conflict
with these functions (which are workarounds for the fact that as of
yet, we still aren't able to split DRM and NVKM completely).

A comparison of objdump disassemblies proves no code changes.

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

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

+2 −2
Original line number Diff line number Diff line
@@ -112,8 +112,8 @@ 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 = nvkm_bios(&drm->device);

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

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

	struct nouveau_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];

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

+2 −2
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 = nvkm_timer(device);

	struct nouveau_timer *ptimer = nvxx_timer(device);

	int i;



	for (i = 0; i < 2; i++) {
@@ -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 = nvkm_gpio(device);

	struct nouveau_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

+1 −1
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ 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 = nvkm_i2c(&drm->device);

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

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

	struct nouveau_i2c_board_info info[] = {

		{

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 = nvkm_i2c(&drm->device);

	struct nouveau_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

+1 −1
Original line number Diff line number Diff line
@@ -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 = nvkm_bios(&drm->device);

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

	struct nvbios_init init = {

		.subdev = nv_subdev(bios),

		.bios = bios,