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

Commit 3d0f8536 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

One modesetting, one gk20a fix.

* 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/nv50/disp: Fix modeset on G94
  drm/gk20a/fb: fix setting of large page size bit
parents 64e5fcc6 eae7382b

drivers/gpu/drm/nouveau/core/subdev/fb/gk20a.c

+15 −1
Original line number Diff line number Diff line
@@ -26,6 +26,20 @@ struct gk20a_fb_priv { 
	struct nouveau_fb base;

};



static int

gk20a_fb_init(struct nouveau_object *object)

{

	struct gk20a_fb_priv *priv = (void *)object;

	int ret;



	ret = nouveau_fb_init(&priv->base);

	if (ret)

		return ret;



	nv_mask(priv, 0x100c80, 0x00000001, 0x00000000); /* 128KiB lpg */

	return 0;

}



static int

gk20a_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine,

	     struct nouveau_oclass *oclass, void *data, u32 size,
@@ -48,7 +62,7 @@ gk20a_fb_oclass = &(struct nouveau_fb_impl) { 
	.base.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = gk20a_fb_ctor,

		.dtor = _nouveau_fb_dtor,

		.init = _nouveau_fb_init,

		.init = gk20a_fb_init,

		.fini = _nouveau_fb_fini,

	},

	.memtype = nvc0_fb_memtype_valid,

drivers/gpu/drm/nouveau/nv50_display.c

+23 −2
Original line number Diff line number Diff line
@@ -790,6 +790,22 @@ nv50_crtc_set_scale(struct nouveau_crtc *nv_crtc, bool update) 
	return 0;

}



static int

nv50_crtc_set_raster_vblank_dmi(struct nouveau_crtc *nv_crtc, u32 usec)

{

	struct nv50_mast *mast = nv50_mast(nv_crtc->base.dev);

	u32 *push;



	push = evo_wait(mast, 8);

	if (!push)

		return -ENOMEM;



	evo_mthd(push, 0x0828 + (nv_crtc->index * 0x400), 1);

	evo_data(push, usec);

	evo_kick(push, mast);

	return 0;

}



static int

nv50_crtc_set_color_vibrance(struct nouveau_crtc *nv_crtc, bool update)

{
@@ -1104,14 +1120,14 @@ nv50_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *umode, 
			evo_mthd(push, 0x0804 + (nv_crtc->index * 0x400), 2);

			evo_data(push, 0x00800000 | mode->clock);

			evo_data(push, (ilace == 2) ? 2 : 0);

			evo_mthd(push, 0x0810 + (nv_crtc->index * 0x400), 8);

			evo_mthd(push, 0x0810 + (nv_crtc->index * 0x400), 6);

			evo_data(push, 0x00000000);

			evo_data(push, (vactive << 16) | hactive);

			evo_data(push, ( vsynce << 16) | hsynce);

			evo_data(push, (vblanke << 16) | hblanke);

			evo_data(push, (vblanks << 16) | hblanks);

			evo_data(push, (vblan2e << 16) | vblan2s);

			evo_data(push, vblankus);

			evo_mthd(push, 0x082c + (nv_crtc->index * 0x400), 1);

			evo_data(push, 0x00000000);

			evo_mthd(push, 0x0900 + (nv_crtc->index * 0x400), 2);

			evo_data(push, 0x00000311);
@@ -1141,6 +1157,11 @@ nv50_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *umode, 
	nv_connector = nouveau_crtc_connector_get(nv_crtc);

	nv50_crtc_set_dither(nv_crtc, false);

	nv50_crtc_set_scale(nv_crtc, false);



	/* G94 only accepts this after setting scale */

	if (nv50_vers(mast) < GF110_DISP_CORE_CHANNEL_DMA)

		nv50_crtc_set_raster_vblank_dmi(nv_crtc, vblankus);



	nv50_crtc_set_color_vibrance(nv_crtc, false);

	nv50_crtc_set_image(nv_crtc, crtc->primary->fb, x, y, false);

	return 0;