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

Commit 46f2b607 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next into drm-core-next 

* 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next: (55 commits)
  drm/nouveau: make cursor_set implementation consistent with other drivers
  drm/nva3/clk: better pll calculation when no fractional fb div available
  drm/nouveau/pm: translate ramcfg strap through ram restrict table
  drm/nva3/pm: allow use of divisor 16
  drm/nvc0/pm: parse clock for pll 0x0a (0x137020) from perf table
  drm/nvc0/pm: correct core/mem/shader perflvl parsing
  drm/nouveau/pm: remove memtiming support check when assigning to perflvl
  drm/nva3: support for memory timing map table
  drm/nouveau: Associate memtimings with performance levels on cards <= nv98
  drm/nva3/pm: initial pass at set_clock() hook
  drm/nvc0/gr: calculate some more of our magic numbers
  drm/nv50: respect LVDS link count from EDID on SPWG panels
  drm/nouveau: recognise DCB connector type 0x41 as LVDS
  drm/nouveau: fix uninitialised variable warning
  drm/nouveau: Fix a crash at card takedown for NV40 and older cards
  drm/nouveau: Free nv04 instmem ramin heap at card takedown
  drm/nva3: somewhat improve clock reporting
  drm/nouveau: pull refclk from vbios on limits 0x40 boards
  drm/nv40/gr: oops, fix random bits getting set in engine obj
  drm/nv50: improve nv50_pm_get_clock()
  ...
parents 69f7876b b4fa9d0f

drivers/gpu/drm/nouveau/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \ 
             nv40_graph.o nv50_graph.o nvc0_graph.o \

             nv40_grctx.o nv50_grctx.o nvc0_grctx.o \

             nv84_crypt.o \

             nva3_copy.o nvc0_copy.o \

             nv40_mpeg.o nv50_mpeg.o \

             nv04_instmem.o nv50_instmem.o nvc0_instmem.o \

             nv50_evo.o nv50_crtc.o nv50_dac.o nv50_sor.o \

             nv50_cursor.o nv50_display.o \

drivers/gpu/drm/nouveau/nouveau_bios.c

+2 −5
Original line number Diff line number Diff line
@@ -5049,11 +5049,7 @@ int get_pll_limits(struct drm_device *dev, uint32_t limit_match, struct pll_lims 
		pll_lim->vco1.max_n = record[11];

		pll_lim->min_p = record[12];

		pll_lim->max_p = record[13];

		/* where did this go to?? */

		if ((entry[0] & 0xf0) == 0x80)

			pll_lim->refclk = 27000;

		else

			pll_lim->refclk = 100000;

		pll_lim->refclk = ROM16(entry[9]) * 1000;

	}



	/*
@@ -6035,6 +6031,7 @@ parse_dcb_connector_table(struct nvbios *bios) 
		case DCB_CONNECTOR_DVI_I:

		case DCB_CONNECTOR_DVI_D:

		case DCB_CONNECTOR_LVDS:

		case DCB_CONNECTOR_LVDS_SPWG:

		case DCB_CONNECTOR_DP:

		case DCB_CONNECTOR_eDP:

		case DCB_CONNECTOR_HDMI_0:

drivers/gpu/drm/nouveau/nouveau_bios.h

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ enum dcb_connector_type { 
	DCB_CONNECTOR_DVI_I = 0x30,

	DCB_CONNECTOR_DVI_D = 0x31,

	DCB_CONNECTOR_LVDS = 0x40,

	DCB_CONNECTOR_LVDS_SPWG = 0x41,

	DCB_CONNECTOR_DP = 0x46,

	DCB_CONNECTOR_eDP = 0x47,

	DCB_CONNECTOR_HDMI_0 = 0x60,

drivers/gpu/drm/nouveau/nouveau_channel.c

+6 −14
Original line number Diff line number Diff line
@@ -268,9 +268,8 @@ nouveau_channel_put_unlocked(struct nouveau_channel **pchan) 
	struct drm_device *dev = chan->dev;

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo;

	struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;

	struct nouveau_crypt_engine *pcrypt = &dev_priv->engine.crypt;

	unsigned long flags;

	int i;



	/* decrement the refcount, and we're done if there's still refs */

	if (likely(!atomic_dec_and_test(&chan->users))) {
@@ -294,19 +293,12 @@ nouveau_channel_put_unlocked(struct nouveau_channel **pchan) 
	/* boot it off the hardware */

	pfifo->reassign(dev, false);



	/* We want to give pgraph a chance to idle and get rid of all

	 * potential errors. We need to do this without the context

	 * switch lock held, otherwise the irq handler is unable to

	 * process them.

	 */

	if (pgraph->channel(dev) == chan)

		nouveau_wait_for_idle(dev);



	/* destroy the engine specific contexts */

	pfifo->destroy_context(chan);

	pgraph->destroy_context(chan);

	if (pcrypt->destroy_context)

		pcrypt->destroy_context(chan);

	for (i = 0; i < NVOBJ_ENGINE_NR; i++) {

		if (chan->engctx[i])

			dev_priv->eng[i]->context_del(chan, i);

	}



	pfifo->reassign(dev, true);
@@ -414,7 +406,7 @@ nouveau_ioctl_fifo_alloc(struct drm_device *dev, void *data, 
	struct nouveau_channel *chan;

	int ret;



	if (dev_priv->engine.graph.accel_blocked)

	if (!dev_priv->eng[NVOBJ_ENGINE_GR])

		return -ENODEV;



	if (init->fb_ctxdma_handle == ~0 || init->tt_ctxdma_handle == ~0)

drivers/gpu/drm/nouveau/nouveau_connector.c

+5 −3
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ nouveau_connector_set_property(struct drm_connector *connector, 
		}



		/* LVDS always needs gpu scaling */

		if (nv_connector->dcb->type == DCB_CONNECTOR_LVDS &&

		if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS &&

		    value == DRM_MODE_SCALE_NONE)

			return -EINVAL;
@@ -650,6 +650,7 @@ nouveau_connector_get_modes(struct drm_connector *connector) 
		ret = get_slave_funcs(encoder)->get_modes(encoder, connector);



	if (nv_connector->dcb->type == DCB_CONNECTOR_LVDS ||

	    nv_connector->dcb->type == DCB_CONNECTOR_LVDS_SPWG ||

	    nv_connector->dcb->type == DCB_CONNECTOR_eDP)

		ret += nouveau_connector_scaler_modes_add(connector);
@@ -810,6 +811,7 @@ nouveau_connector_create(struct drm_device *dev, int index) 
		type = DRM_MODE_CONNECTOR_HDMIA;

		break;

	case DCB_CONNECTOR_LVDS:

	case DCB_CONNECTOR_LVDS_SPWG:

		type = DRM_MODE_CONNECTOR_LVDS;

		funcs = &nouveau_connector_funcs_lvds;

		break;
@@ -838,7 +840,7 @@ nouveau_connector_create(struct drm_device *dev, int index) 
	drm_connector_helper_add(connector, &nouveau_connector_helper_funcs);



	/* Check if we need dithering enabled */

	if (dcb->type == DCB_CONNECTOR_LVDS) {

	if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS) {

		bool dummy, is_24bit = false;



		ret = nouveau_bios_parse_lvds_table(dev, 0, &dummy, &is_24bit);
@@ -883,7 +885,7 @@ nouveau_connector_create(struct drm_device *dev, int index) 
				nv_connector->use_dithering ?

				DRM_MODE_DITHERING_ON : DRM_MODE_DITHERING_OFF);



		if (dcb->type != DCB_CONNECTOR_LVDS) {

		if (connector->connector_type != DRM_MODE_CONNECTOR_LVDS) {

			if (dev_priv->card_type >= NV_50)

				connector->polled = DRM_CONNECTOR_POLL_HPD;

			else