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

Commit f4684006 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-next

Add GK110 modesetting suport.

* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nve0: recognise nvf0 as a kepler board (GK110)
  drm/nouveau: force noaccel when no PFIFO support present
  drm/nvf0/disp: expose display class 2.2
parents b11b88ef 7b4f638b

drivers/gpu/drm/nouveau/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ nouveau-y += core/engine/disp/nva0.o 
nouveau-y += core/engine/disp/nva3.o

nouveau-y += core/engine/disp/nvd0.o

nouveau-y += core/engine/disp/nve0.o

nouveau-y += core/engine/disp/nvf0.o

nouveau-y += core/engine/disp/dacnv50.o

nouveau-y += core/engine/disp/dport.o

nouveau-y += core/engine/disp/hdanva3.o

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

+2 −1
Original line number Diff line number Diff line
@@ -172,7 +172,8 @@ nouveau_devobj_ctor(struct nouveau_object *parent, 
			case 0xa0: device->card_type = NV_50; break;

			case 0xc0: device->card_type = NV_C0; break;

			case 0xd0: device->card_type = NV_D0; break;

			case 0xe0: device->card_type = NV_E0; break;

			case 0xe0:

			case 0xf0: device->card_type = NV_E0; break;

			default:

				break;

			}

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

+34 −0
Original line number Diff line number Diff line
@@ -141,6 +141,40 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_VP     ] = &nve0_vp_oclass;

		device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;

		break;

	case 0xf0:

		device->cname = "GK110";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] = &nvc0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTCG   ] = &nvc0_ltcg_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

#if 0

		device->oclass[NVDEV_ENGINE_FIFO   ] = &nve0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] = &nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nve0_graph_oclass;

#endif

		device->oclass[NVDEV_ENGINE_DISP   ] = &nvf0_disp_oclass;

#if 0

		device->oclass[NVDEV_ENGINE_COPY0  ] = &nve0_copy0_oclass;

		device->oclass[NVDEV_ENGINE_COPY1  ] = &nve0_copy1_oclass;

		device->oclass[NVDEV_ENGINE_COPY2  ] = &nve0_copy2_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &nve0_bsp_oclass;

		device->oclass[NVDEV_ENGINE_VP     ] = &nve0_vp_oclass;

		device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;

#endif

		break;

	default:

		nv_fatal(device, "unknown Kepler chipset\n");

		return -EINVAL;

drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c

0 → 100644
+89 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2012 Red Hat Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 * Authors: Ben Skeggs

 */



#include <engine/software.h>

#include <engine/disp.h>



#include <core/class.h>



#include "nv50.h"



static struct nouveau_oclass

nvf0_disp_sclass[] = {

	{ NVF0_DISP_MAST_CLASS, &nvd0_disp_mast_ofuncs },

	{ NVF0_DISP_SYNC_CLASS, &nvd0_disp_sync_ofuncs },

	{ NVF0_DISP_OVLY_CLASS, &nvd0_disp_ovly_ofuncs },

	{ NVF0_DISP_OIMM_CLASS, &nvd0_disp_oimm_ofuncs },

	{ NVF0_DISP_CURS_CLASS, &nvd0_disp_curs_ofuncs },

	{}

};



static struct nouveau_oclass

nvf0_disp_base_oclass[] = {

	{ NVF0_DISP_CLASS, &nvd0_disp_base_ofuncs, nva3_disp_base_omthds },

	{}

};



static int

nvf0_disp_ctor(struct nouveau_object *parent, struct nouveau_object *engine,

	       struct nouveau_oclass *oclass, void *data, u32 size,

	       struct nouveau_object **pobject)

{

	struct nv50_disp_priv *priv;

	int heads = nv_rd32(parent, 0x022448);

	int ret;



	ret = nouveau_disp_create(parent, engine, oclass, heads,

				  "PDISP", "display", &priv);

	*pobject = nv_object(priv);

	if (ret)

		return ret;



	nv_engine(priv)->sclass = nvf0_disp_base_oclass;

	nv_engine(priv)->cclass = &nv50_disp_cclass;

	nv_subdev(priv)->intr = nvd0_disp_intr;

	INIT_WORK(&priv->supervisor, nvd0_disp_intr_supervisor);

	priv->sclass = nvf0_disp_sclass;

	priv->head.nr = heads;

	priv->dac.nr = 3;

	priv->sor.nr = 4;

	priv->dac.power = nv50_dac_power;

	priv->dac.sense = nv50_dac_sense;

	priv->sor.power = nv50_sor_power;

	priv->sor.hda_eld = nvd0_hda_eld;

	priv->sor.hdmi = nvd0_hdmi_ctrl;

	priv->sor.dp = &nvd0_sor_dp_func;

	return 0;

}



struct nouveau_oclass

nvf0_disp_oclass = {

	.handle = NV_ENGINE(DISP, 0x92),

	.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = nvf0_disp_ctor,

		.dtor = _nouveau_disp_dtor,

		.init = _nouveau_disp_init,

		.fini = _nouveau_disp_fini,

	},

};

drivers/gpu/drm/nouveau/core/engine/dmaobj/nvd0.c

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ nvd0_dmaobj_bind(struct nouveau_dmaeng *dmaeng, 
		case NVE0_DISP_MAST_CLASS:

		case NVE0_DISP_SYNC_CLASS:

		case NVE0_DISP_OVLY_CLASS:

		case NVF0_DISP_MAST_CLASS:

		case NVF0_DISP_SYNC_CLASS:

		case NVF0_DISP_OVLY_CLASS:

			break;

		default:

			return -EINVAL;