Commit 989eea61 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-5.2' of git://github.com/skeggsb/linux into drm-next 



No major changes ready for this round, but a few misc fixes instead.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv7+Ch=r9pt+kPRP8obo_uLscL9Hrg3xq4s92StLvgy=Mw@mail.gmail.com
parents 7c13e5cc 30df16b9

drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ struct nvkm_i2c_bus { 
	struct mutex mutex;

	struct list_head head;

	struct i2c_adapter i2c;

	u8 enabled;

};



int nvkm_i2c_bus_acquire(struct nvkm_i2c_bus *);
@@ -57,6 +58,7 @@ struct nvkm_i2c_aux { 
	struct mutex mutex;

	struct list_head head;

	struct i2c_adapter i2c;

	u8 enabled;



	u32 intr;

};

drivers/gpu/drm/nouveau/nouveau_display.c

+0 −9
Original line number Diff line number Diff line
@@ -358,15 +358,6 @@ nouveau_display_hpd_work(struct work_struct *work) 


#ifdef CONFIG_ACPI



/*

 * Hans de Goede: This define belongs in acpi/video.h, I've submitted a patch

 * to the acpi subsys to move it there from drivers/acpi/acpi_video.c .

 * This should be dropped once that is merged.

 */

#ifndef ACPI_VIDEO_NOTIFY_PROBE

#define ACPI_VIDEO_NOTIFY_PROBE			0x81

#endif



static int

nouveau_display_acpi_ntfy(struct notifier_block *nb, unsigned long val,

			  void *data)

drivers/gpu/drm/nouveau/nouveau_drm.c

+11 −1
Original line number Diff line number Diff line
@@ -802,10 +802,15 @@ fail_display: 
static int

nouveau_do_resume(struct drm_device *dev, bool runtime)

{

	int ret = 0;

	struct nouveau_drm *drm = nouveau_drm(dev);



	NV_DEBUG(drm, "resuming object tree...\n");

	nvif_client_resume(&drm->master.base);

	ret = nvif_client_resume(&drm->master.base);

	if (ret) {

		NV_ERROR(drm, "Client resume failed with error: %d\n", ret);

		return ret;

	}



	NV_DEBUG(drm, "resuming fence...\n");

	if (drm->fence && nouveau_fence(drm)->resume)
@@ -925,6 +930,7 @@ nouveau_pmops_runtime_resume(struct device *dev) 
{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct drm_device *drm_dev = pci_get_drvdata(pdev);

	struct nouveau_drm *drm = nouveau_drm(drm_dev);

	struct nvif_device *device = &nouveau_drm(drm_dev)->client.device;

	int ret;
@@ -941,6 +947,10 @@ nouveau_pmops_runtime_resume(struct device *dev) 
	pci_set_master(pdev);



	ret = nouveau_do_resume(drm_dev, true);

	if (ret) {

		NV_ERROR(drm, "resume failed with: %d\n", ret);

		return ret;

	}



	/* do magic */

	nvif_mask(&device->object, 0x088488, (1 << 25), (1 << 25));

drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c

+2 −0
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ gf100_bar_oneinit_bar(struct gf100_bar *bar, struct gf100_barN *bar_vm, 
		return ret;



	bar_len = device->func->resource_size(device, bar_nr);

	if (!bar_len)

		return -ENOMEM;

	if (bar_nr == 3 && bar->bar2_halve)

		bar_len >>= 1;

drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c

+11 −3
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ nv50_bar_oneinit(struct nvkm_bar *base) 
	struct nvkm_device *device = bar->base.subdev.device;

	static struct lock_class_key bar1_lock;

	static struct lock_class_key bar2_lock;

	u64 start, limit;

	u64 start, limit, size;

	int ret;



	ret = nvkm_gpuobj_new(device, 0x20000, 0, false, NULL, &bar->mem);
@@ -127,7 +127,10 @@ nv50_bar_oneinit(struct nvkm_bar *base) 


	/* BAR2 */

	start = 0x0100000000ULL;

	limit = start + device->func->resource_size(device, 3);

	size = device->func->resource_size(device, 3);

	if (!size)

		return -ENOMEM;

	limit = start + size;



	ret = nvkm_vmm_new(device, start, limit-- - start, NULL, 0,

			   &bar2_lock, "bar2", &bar->bar2_vmm);
@@ -164,10 +167,15 @@ nv50_bar_oneinit(struct nvkm_bar *base) 


	/* BAR1 */

	start = 0x0000000000ULL;

	limit = start + device->func->resource_size(device, 1);

	size = device->func->resource_size(device, 1);

	if (!size)

		return -ENOMEM;

	limit = start + size;



	ret = nvkm_vmm_new(device, start, limit-- - start, NULL, 0,

			   &bar1_lock, "bar1", &bar->bar1_vmm);

	if (ret)

		return ret;



	atomic_inc(&bar->bar1_vmm->engref[NVKM_SUBDEV_BAR]);

	bar->bar1_vmm->debug = bar->base.subdev.debug;

CRA Git | Maintained and supported by SUSTech CRA and CCSE