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

Commit e3b3656c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-for-v4.8-final' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "drm fixes for final 4.8.

  One big regression fix for udl, along with two amdgpu fixes and two
  nouveau fixes.

  All seems pretty safe and useful"

* tag 'drm-fixes-for-v4.8-final' of git://people.freedesktop.org/~airlied/linux:
  drm/udl: fix line iterator in damage handling
  drm/radeon/si/dpm: add workaround for for Jet parts
  drm/amdgpu: disable CRTCs before teardown
  drm/nouveau: Revert "bus: remove cpu_coherent flag"
  drm/nouveau/fifo/nv04: avoid ramht race against cookie insertion
parents c6169de7 90fd68dc

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+1 −1
Original line number Diff line number Diff line
@@ -1708,11 +1708,11 @@ void amdgpu_device_fini(struct amdgpu_device *adev) 


	DRM_INFO("amdgpu: finishing device.\n");

	adev->shutdown = true;

	drm_crtc_force_disable_all(adev->ddev);

	/* evict vram memory */

	amdgpu_bo_evict_vram(adev);

	amdgpu_ib_pool_fini(adev);

	amdgpu_fence_driver_fini(adev);

	drm_crtc_force_disable_all(adev->ddev);

	amdgpu_fbdev_fini(adev);

	r = amdgpu_fini(adev);

	kfree(adev->ip_block_status);

drivers/gpu/drm/nouveau/include/nvkm/core/device.h

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ struct nvkm_device_func { 
	void (*fini)(struct nvkm_device *, bool suspend);

	resource_size_t (*resource_addr)(struct nvkm_device *, unsigned bar);

	resource_size_t (*resource_size)(struct nvkm_device *, unsigned bar);

	bool cpu_coherent;

};



struct nvkm_device_quirk {

drivers/gpu/drm/nouveau/nouveau_bo.c

+2 −1
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ nouveau_bo_new(struct drm_device *dev, int size, int align, 
	nvbo->tile_flags = tile_flags;

	nvbo->bo.bdev = &drm->ttm.bdev;



	if (!nvxx_device(&drm->device)->func->cpu_coherent)

		nvbo->force_coherent = flags & TTM_PL_FLAG_UNCACHED;



	nvbo->page_shift = 12;

drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -1614,6 +1614,7 @@ nvkm_device_pci_func = { 
	.fini = nvkm_device_pci_fini,

	.resource_addr = nvkm_device_pci_resource_addr,

	.resource_size = nvkm_device_pci_resource_size,

	.cpu_coherent = !IS_ENABLED(CONFIG_ARM),

};



int

drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ nvkm_device_tegra_func = { 
	.fini = nvkm_device_tegra_fini,

	.resource_addr = nvkm_device_tegra_resource_addr,

	.resource_size = nvkm_device_tegra_resource_size,

	.cpu_coherent = false,

};



int