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

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

drm/nouveau/nvif: simplify and tidy library interfaces 



A variety of tweaks to the NVIF library interfaces, mostly ripping out
things that turned out to be not so useful.

- Removed refcounting from nvif_object, callers are expected to not be
  stupid instead.
- nvif_client is directly reachable from anything derived from nvif_object,
  removing the need for heuristics to locate it
- _new() versions of interfaces, that allocate memory for the object
  they construct, have been removed.  The vast majority of callers used
  the embedded _init() interfaces.
- No longer storing constructor arguments (and the data returned from
  nvkm) inside nvif_object, it's more or less unused and just wastes
  memory.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ nv04_update_arb(struct drm_device *dev, int VClk, int bpp, 
		int *burst, int *lwm)

{

	struct nouveau_drm *drm = nouveau_drm(dev);

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

	struct nvif_object *device = &nouveau_drm(dev)->device.object;

	struct nv_fifo_info fifo_data;

	struct nv_sim_state sim_data;

	int MClk = nouveau_hw_get_clock(dev, PLL_MEMORY);

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

+8 −7
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ 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_drm *drm = nouveau_drm(dev);

	struct nvif_object *device = &drm->device.object;

	int i;



	for (i = 0; i < 2; i++) {
@@ -79,19 +80,19 @@ 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 (nvif_msec(device, 10,

		if (nvif_msec(&drm->device, 10,

			if (!(nvif_rd32(device, NV_PRMCIO_INP0__COLOR) & 1))

				break;

		) < 0)

			return -EBUSY;



		if (nvif_msec(device, 10,

		if (nvif_msec(&drm->device, 10,

			if ( (nvif_rd32(device, NV_PRMCIO_INP0__COLOR) & 1))

				break;

		) < 0)

			return -EBUSY;



		if (nvif_msec(device, 10,

		if (nvif_msec(&drm->device, 10,

			if (!(nvif_rd32(device, NV_PRMCIO_INP0__COLOR) & 1))

				break;

		) < 0)
@@ -132,7 +133,7 @@ static enum drm_connector_status nv04_dac_detect(struct drm_encoder *encoder, 
						 struct drm_connector *connector)

{

	struct drm_device *dev = encoder->dev;

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

	struct nvif_object *device = &nouveau_drm(dev)->device.object;

	struct nouveau_drm *drm = nouveau_drm(dev);

	uint8_t saved_seq1, saved_pi, saved_rpc1, saved_cr_mode;

	uint8_t saved_palette0[3], saved_palette_mask;
@@ -235,8 +236,8 @@ 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 nvkm_gpio *gpio = nvxx_gpio(device);

	struct nvif_object *device = &nouveau_drm(dev)->device.object;

	struct nvkm_gpio *gpio = nvxx_gpio(&drm->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
@@ -281,7 +281,7 @@ static void nv04_dfp_mode_set(struct drm_encoder *encoder, 
			      struct drm_display_mode *adjusted_mode)

{

	struct drm_device *dev = encoder->dev;

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

	struct nvif_object *device = &nouveau_drm(dev)->device.object;

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder->crtc);

	struct nv04_crtc_reg *regp = &nv04_display(dev)->mode_reg.crtc_reg[nv_crtc->index];

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

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ nv04_display_create(struct drm_device *dev) 
	if (!disp)

		return -ENOMEM;



	nvif_object_map(nvif_object(&drm->device));

	nvif_object_map(&drm->device.object);



	nouveau_display(dev)->priv = disp;

	nouveau_display(dev)->dtor = nv04_display_destroy;
@@ -153,7 +153,7 @@ nv04_display_destroy(struct drm_device *dev) 
	nouveau_display(dev)->priv = NULL;

	kfree(disp);



	nvif_object_unmap(nvif_object(&drm->device));

	nvif_object_unmap(&drm->device.object);

}



int

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

+11 −11
Original line number Diff line number Diff line
@@ -165,8 +165,8 @@ nouveau_hw_get_pllvals(struct drm_device *dev, enum nvbios_pll_type plltype, 
		       struct nvkm_pll_vals *pllvals)

{

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nvif_device *device = &drm->device;

	struct nvkm_bios *bios = nvxx_bios(device);

	struct nvif_object *device = &drm->device.object;

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

	uint32_t reg1, pll1, pll2 = 0;

	struct nvbios_pll pll_lim;

	int ret;
@@ -660,7 +660,7 @@ nv_load_state_ext(struct drm_device *dev, int head, 
		  struct nv04_mode_state *state)

{

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nvif_device *device = &drm->device;

	struct nvif_object *device = &drm->device.object;

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

	uint32_t reg900;

	int i;
@@ -677,10 +677,10 @@ nv_load_state_ext(struct drm_device *dev, int head, 
		nvif_wr32(device, NV_PVIDEO_INTR_EN, 0);

		nvif_wr32(device, NV_PVIDEO_OFFSET_BUFF(0), 0);

		nvif_wr32(device, NV_PVIDEO_OFFSET_BUFF(1), 0);

		nvif_wr32(device, NV_PVIDEO_LIMIT(0), device->info.ram_size - 1);

		nvif_wr32(device, NV_PVIDEO_LIMIT(1), device->info.ram_size - 1);

		nvif_wr32(device, NV_PVIDEO_UVPLANE_LIMIT(0), device->info.ram_size - 1);

		nvif_wr32(device, NV_PVIDEO_UVPLANE_LIMIT(1), device->info.ram_size - 1);

		nvif_wr32(device, NV_PVIDEO_LIMIT(0), drm->device.info.ram_size - 1);

		nvif_wr32(device, NV_PVIDEO_LIMIT(1), drm->device.info.ram_size - 1);

		nvif_wr32(device, NV_PVIDEO_UVPLANE_LIMIT(0), drm->device.info.ram_size - 1);

		nvif_wr32(device, NV_PVIDEO_UVPLANE_LIMIT(1), drm->device.info.ram_size - 1);

		nvif_wr32(device, NV_PBUS_POWERCTRL_2, 0);



		NVWriteCRTC(dev, head, NV_PCRTC_CURSOR_CONFIG, regp->cursor_cfg);
@@ -740,11 +740,11 @@ nv_load_state_ext(struct drm_device *dev, int head, 
		if (drm->device.info.family < NV_DEVICE_INFO_V0_KELVIN) {

			/* Not waiting for vertical retrace before modifying

			   CRE_53/CRE_54 causes lockups. */

			nvif_msec(device, 650,

			nvif_msec(&drm->device, 650,

				if ( (nvif_rd32(device, NV_PRMCIO_INP0__COLOR) & 8))

					break;

			);

			nvif_msec(device, 650,

			nvif_msec(&drm->device, 650,

				if (!(nvif_rd32(device, NV_PRMCIO_INP0__COLOR) & 8))

					break;

			);
@@ -770,7 +770,7 @@ static void 
nv_save_state_palette(struct drm_device *dev, int head,

		      struct nv04_mode_state *state)

{

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

	struct nvif_object *device = &nouveau_drm(dev)->device.object;

	int head_offset = head * NV_PRMDIO_SIZE, i;



	nvif_wr08(device, NV_PRMDIO_PIXEL_MASK + head_offset,
@@ -789,7 +789,7 @@ void 
nouveau_hw_load_state_palette(struct drm_device *dev, int head,

			      struct nv04_mode_state *state)

{

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

	struct nvif_object *device = &nouveau_drm(dev)->device.object;

	int head_offset = head * NV_PRMDIO_SIZE, i;



	nvif_wr08(device, NV_PRMDIO_PIXEL_MASK + head_offset,