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

Commit 3439633a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-4.3' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next 

Rather large pull request this time around, due to the long-pending
cleanup of the kernel driver being here.  There's a stupidly large
number of commits for that, as I wanted to have the series be
bisectable at a fairly fine-grained level.  That said, a very large
portion of the churn in the rework was automated, and a very large
number of boards from right across the whole range we support have
been tested.  I'm fairly confident there shouldn't be (too many)
issues from this.

Beyond correcting some not-so-great design decisions and making the
code a lot easier to work with, there's not much exciting (lower
memory usage, GPU VM should be a lot faster, etc) to be gained by the
end-user as a result of the cleanup, it mostly lays the groundwork for
future improvements.

A big thanks goes to Alexandre Courbot for testing/debugging the GK20A
codepaths for me :)

Highlights:
- A heap of perfmon work, providing a more useful userspace interface
and specifying counters for a bunch of boards
- Support for GT200 reclocking + other misc pm improvements
- Initial patches towards supporting GM20B (Tegra X1)
- Maxwell DisplayPort fixes
- Cleanup of the kernel driver
- The usual collection of random fixes

* 'linux-4.3' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (312 commits)
  drm/nouveau: bump driver version for release
  drm/nouveau/tegra: merge platform setup from nouveau drm
  drm/nouveau/pci: merge agp handling from nouveau drm
  drm/nouveau/device: remove pci/platform_device from common struct
  drm/nouveau/device: import pciid list and integrate quirks with it
  drm/nouveau/device: cleaner abstraction for device resource functions
  drm/nouveau/mc: move device irq handling to platform-specific code
  drm/nouveau/mc/gf100-: handle second interrupt tree
  drm/nouveau/mc: abstract interface to master intr registers
  drm/nouveau/pci: new subdev
  drm/nouveau/object: merge with handle
  drm/nouveau/core: remove the remainder of the previous style
  drm/nouveau/mpeg: convert to new-style nvkm_engine
  drm/nouveau/sw: convert to new-style nvkm_engine
  drm/nouveau/pm: convert to new-style nvkm_engine
  drm/nouveau/gr: convert to new-style nvkm_engine
  drm/nouveau/fifo: convert to new-style nvkm_engine
  drm/nouveau/disp: convert to new-style nvkm_engine
  drm/nouveau/dma: convert to new-style nvkm_engine
  drm/nouveau/cipher: convert to new-style nvkm_engine
  ...
parents d7b27368 a3c1ff87

drivers/gpu/drm/nouveau/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ nouveau-y += $(nvkm-y) 
ifdef CONFIG_X86

nouveau-$(CONFIG_ACPI) += nouveau_acpi.o

endif

nouveau-y += nouveau_agp.o

nouveau-$(CONFIG_DEBUG_FS) += nouveau_debugfs.o

nouveau-y += nouveau_drm.o

nouveau-y += nouveau_hwmon.o

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

+25 −20
Original line number Diff line number Diff line
@@ -65,8 +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 nvkm_timer *ptimer = nvxx_timer(device);

	struct nouveau_drm *drm = nouveau_drm(dev);

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

	int i;



	for (i = 0; i < 2; i++) {
@@ -80,17 +80,22 @@ 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 (!nvkm_timer_wait_eq(ptimer, 10000000,

					NV_PRMCIO_INP0__COLOR,

					0x00000001, 0x00000000))

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

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

				break;

		) < 0)

			return -EBUSY;

		if (!nvkm_timer_wait_eq(ptimer, 10000000,

					NV_PRMCIO_INP0__COLOR,

					0x00000001, 0x00000001))



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

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

				break;

		) < 0)

			return -EBUSY;

		if (!nvkm_timer_wait_eq(ptimer, 10000000,

					NV_PRMCIO_INP0__COLOR,

					0x00000001, 0x00000000))



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

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

				break;

		) < 0)

			return -EBUSY;



		udelay(100);
@@ -128,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;
@@ -231,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,
@@ -265,10 +270,10 @@ uint32_t nv17_dac_sample_load(struct drm_encoder *encoder) 
	}



	if (gpio) {

		saved_gpio1 = gpio->get(gpio, 0, DCB_GPIO_TVDAC1, 0xff);

		saved_gpio0 = gpio->get(gpio, 0, DCB_GPIO_TVDAC0, 0xff);

		gpio->set(gpio, 0, DCB_GPIO_TVDAC1, 0xff, dcb->type == DCB_OUTPUT_TV);

		gpio->set(gpio, 0, DCB_GPIO_TVDAC0, 0xff, dcb->type == DCB_OUTPUT_TV);

		saved_gpio1 = nvkm_gpio_get(gpio, 0, DCB_GPIO_TVDAC1, 0xff);

		saved_gpio0 = nvkm_gpio_get(gpio, 0, DCB_GPIO_TVDAC0, 0xff);

		nvkm_gpio_set(gpio, 0, DCB_GPIO_TVDAC1, 0xff, dcb->type == DCB_OUTPUT_TV);

		nvkm_gpio_set(gpio, 0, DCB_GPIO_TVDAC0, 0xff, dcb->type == DCB_OUTPUT_TV);

	}



	msleep(4);
@@ -320,8 +325,8 @@ uint32_t nv17_dac_sample_load(struct drm_encoder *encoder) 
	nvif_wr32(device, NV_PBUS_POWERCTRL_2, saved_powerctrl_2);



	if (gpio) {

		gpio->set(gpio, 0, DCB_GPIO_TVDAC1, 0xff, saved_gpio1);

		gpio->set(gpio, 0, DCB_GPIO_TVDAC0, 0xff, saved_gpio0);

		nvkm_gpio_set(gpio, 0, DCB_GPIO_TVDAC1, 0xff, saved_gpio1);

		nvkm_gpio_set(gpio, 0, DCB_GPIO_TVDAC0, 0xff, saved_gpio0);

	}



	return sample;

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

+10 −11
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];
@@ -493,11 +493,11 @@ static void nv04_dfp_update_backlight(struct drm_encoder *encoder, int mode) 
	if (dev->pdev->device == 0x0174 || dev->pdev->device == 0x0179 ||

	    dev->pdev->device == 0x0189 || dev->pdev->device == 0x0329) {

		if (mode == DRM_MODE_DPMS_ON) {

			nv_mask(device, NV_PBUS_DEBUG_DUALHEAD_CTL, 1 << 31, 1 << 31);

			nv_mask(device, NV_PCRTC_GPIO_EXT, 3, 1);

			nvif_mask(device, NV_PBUS_DEBUG_DUALHEAD_CTL, 1 << 31, 1 << 31);

			nvif_mask(device, NV_PCRTC_GPIO_EXT, 3, 1);

		} else {

			nv_mask(device, NV_PBUS_DEBUG_DUALHEAD_CTL, 1 << 31, 0);

			nv_mask(device, NV_PCRTC_GPIO_EXT, 3, 0);

			nvif_mask(device, NV_PBUS_DEBUG_DUALHEAD_CTL, 1 << 31, 0);

			nvif_mask(device, NV_PCRTC_GPIO_EXT, 3, 0);

		}

	}

#endif
@@ -624,8 +624,8 @@ static void nv04_tmds_slave_init(struct drm_encoder *encoder) 
	struct dcb_output *dcb = nouveau_encoder(encoder)->dcb;

	struct nouveau_drm *drm = nouveau_drm(dev);

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

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

	struct nvkm_i2c_board_info info[] = {

	struct nvkm_i2c_bus *bus = nvkm_i2c_bus_find(i2c, NVKM_I2C_BUS_PRI);

	struct nvkm_i2c_bus_probe info[] = {

		{

		    {

		        .type = "sil164",
@@ -639,16 +639,15 @@ static void nv04_tmds_slave_init(struct drm_encoder *encoder) 
	};

	int type;



	if (!nv_gf4_disp_arch(dev) || !port ||

	    get_tmds_slave(encoder))

	if (!nv_gf4_disp_arch(dev) || !bus || get_tmds_slave(encoder))

		return;



	type = i2c->identify(i2c, 2, "TMDS transmitter", info, NULL, NULL);

	type = nvkm_i2c_bus_probe(bus, "TMDS transmitter", info, NULL, NULL);

	if (type < 0)

		return;



	drm_i2c_encoder_init(dev, to_encoder_slave(encoder),

			     &port->adapter, &info[type].dev);

			     &bus->i2c, &info[type].dev);

}



static const struct drm_encoder_helper_funcs nv04_lvds_helper_funcs = {

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

+5 −3
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;
@@ -101,7 +101,9 @@ nv04_display_create(struct drm_device *dev) 


	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {

		struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

		nv_encoder->i2c = i2c->find(i2c, nv_encoder->dcb->i2c_index);

		struct nvkm_i2c_bus *bus =

			nvkm_i2c_bus_find(i2c, nv_encoder->dcb->i2c_index);

		nv_encoder->i2c = bus ? &bus->i2c : NULL;

	}



	/* Save previous state */
@@ -151,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