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

Commit c17f5bb5 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-nouveau-next' of... 

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

Fix some pageflip, oopses and some better clock support for some chipsets

* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nv50/disp: min/max are reversed in nv50_crtc_gamma_set()
  drm/nouveau/sw: fix oops if gpu has its display block disabled
  drm/nouveau: unreference fence after syncing
  drm/nouveau/kms: send timestamp data for correct head in flip completion events
  drm/nouveau/clk: Add support for NVAA/NVAC
  drm/nouveau/fifo: Hook up pause and resume for NV50 and NV84+
  drm/nv10/plane: some chipsets don't support NV12
  drm/nv10/plane: add downscaling restrictions
  drm/nv10/plane: fix format computation
  drm/nv04-nv30/clk: provide an empty domain list
parents 10c028e9 bdefc8cb

drivers/gpu/drm/nouveau/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ nouveau-y += core/subdev/clock/nv40.o 
nouveau-y += core/subdev/clock/nv50.o

nouveau-y += core/subdev/clock/nv84.o

nouveau-y += core/subdev/clock/nva3.o

nouveau-y += core/subdev/clock/nvaa.o

nouveau-y += core/subdev/clock/nvc0.o

nouveau-y += core/subdev/clock/nve0.o

nouveau-y += core/subdev/clock/pllnv04.o

drivers/gpu/drm/nouveau/core/engine/device/nv50.c

+2 −2
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nvaa_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;
@@ -311,7 +311,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nvaa_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;

drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <engine/dmaobj.h>

#include <engine/fifo.h>



#include "nv04.h"

#include "nv50.h"



/*******************************************************************************
@@ -460,6 +461,8 @@ nv50_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	nv_subdev(priv)->intr = nv04_fifo_intr;

	nv_engine(priv)->cclass = &nv50_fifo_cclass;

	nv_engine(priv)->sclass = nv50_fifo_sclass;

	priv->base.pause = nv04_fifo_pause;

	priv->base.start = nv04_fifo_start;

	return 0;

}

drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <engine/dmaobj.h>

#include <engine/fifo.h>



#include "nv04.h"

#include "nv50.h"



/*******************************************************************************
@@ -432,6 +433,8 @@ nv84_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	nv_subdev(priv)->intr = nv04_fifo_intr;

	nv_engine(priv)->cclass = &nv84_fifo_cclass;

	nv_engine(priv)->sclass = nv84_fifo_sclass;

	priv->base.pause = nv04_fifo_pause;

	priv->base.start = nv04_fifo_start;

	return 0;

}

drivers/gpu/drm/nouveau/core/engine/software/nv50.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ nv50_software_context_ctor(struct nouveau_object *parent, 
	if (ret)

		return ret;



	chan->vblank.nr_event = pdisp->vblank->index_nr;

	chan->vblank.nr_event = pdisp ? pdisp->vblank->index_nr : 0;

	chan->vblank.event = kzalloc(chan->vblank.nr_event *

				     sizeof(*chan->vblank.event), GFP_KERNEL);

	if (!chan->vblank.event)