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

Commit 520e8bfc authored by Dave Airlie's avatar Dave Airlie
Browse files

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

Two more nouveau fixes.

* 'linux-4.2' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/nouveau/ttm: fix tiled system memory with Maxwell
  drm/nouveau/kms/nv50-: guard against enabling cursor on disabled heads
parents eb8bb777 eb48b12e

drivers/gpu/drm/nouveau/nouveau_ttm.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -175,15 +175,24 @@ nouveau_gart_manager_new(struct ttm_mem_type_manager *man, 
	node->page_shift = 12;

	node->page_shift = 12;





	switch (drm->device.info.family) {

	switch (drm->device.info.family) {

	case NV_DEVICE_INFO_V0_TNT:

	case NV_DEVICE_INFO_V0_CELSIUS:

	case NV_DEVICE_INFO_V0_KELVIN:

	case NV_DEVICE_INFO_V0_RANKINE:

	case NV_DEVICE_INFO_V0_CURIE:

		break;

	case NV_DEVICE_INFO_V0_TESLA:

	case NV_DEVICE_INFO_V0_TESLA:

		if (drm->device.info.chipset != 0x50)

		if (drm->device.info.chipset != 0x50)

			node->memtype = (nvbo->tile_flags & 0x7f00) >> 8;

			node->memtype = (nvbo->tile_flags & 0x7f00) >> 8;

		break;

		break;

	case NV_DEVICE_INFO_V0_FERMI:

	case NV_DEVICE_INFO_V0_FERMI:

	case NV_DEVICE_INFO_V0_KEPLER:

	case NV_DEVICE_INFO_V0_KEPLER:

	case NV_DEVICE_INFO_V0_MAXWELL:

		node->memtype = (nvbo->tile_flags & 0xff00) >> 8;

		node->memtype = (nvbo->tile_flags & 0xff00) >> 8;

		break;

		break;

	default:

	default:

		NV_WARN(drm, "%s: unhandled family type %x\n", __func__,

			drm->device.info.family);

		break;

		break;

	}

	}

drivers/gpu/drm/nouveau/nv50_display.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -979,7 +979,7 @@ nv50_crtc_cursor_show_hide(struct nouveau_crtc *nv_crtc, bool show, bool update) 
{

{

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

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





	if (show && nv_crtc->cursor.nvbo)

	if (show && nv_crtc->cursor.nvbo && nv_crtc->base.enabled)

		nv50_crtc_cursor_show(nv_crtc);

		nv50_crtc_cursor_show(nv_crtc);

	else

	else

		nv50_crtc_cursor_hide(nv_crtc);

		nv50_crtc_cursor_hide(nv_crtc);