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

Commit d4487b57 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-4.16' of git://github.com/skeggsb/linux into drm-fixes 

nouveau regression fixes.

* 'linux-4.16' of git://github.com/skeggsb/linux:
  drm/nouveau/bl: fix backlight regression
  drm/nouveau/bl: Fix oops on driver unbind
  drm/nouveau/mmu: ALIGN_DOWN correct variable
parents 67f19766 9e75dc61

drivers/gpu/drm/nouveau/nouveau_backlight.c

+7 −7
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ nv50_get_intensity(struct backlight_device *bd) 
	struct nouveau_encoder *nv_encoder = bl_get_data(bd);

	struct nouveau_drm *drm = nouveau_drm(nv_encoder->base.base.dev);

	struct nvif_object *device = &drm->client.device.object;

	int or = nv_encoder->or;

	int or = ffs(nv_encoder->dcb->or) - 1;

	u32 div = 1025;

	u32 val;
@@ -149,7 +149,7 @@ nv50_set_intensity(struct backlight_device *bd) 
	struct nouveau_encoder *nv_encoder = bl_get_data(bd);

	struct nouveau_drm *drm = nouveau_drm(nv_encoder->base.base.dev);

	struct nvif_object *device = &drm->client.device.object;

	int or = nv_encoder->or;

	int or = ffs(nv_encoder->dcb->or) - 1;

	u32 div = 1025;

	u32 val = (bd->props.brightness * div) / 100;
@@ -170,7 +170,7 @@ nva3_get_intensity(struct backlight_device *bd) 
	struct nouveau_encoder *nv_encoder = bl_get_data(bd);

	struct nouveau_drm *drm = nouveau_drm(nv_encoder->base.base.dev);

	struct nvif_object *device = &drm->client.device.object;

	int or = nv_encoder->or;

	int or = ffs(nv_encoder->dcb->or) - 1;

	u32 div, val;



	div  = nvif_rd32(device, NV50_PDISP_SOR_PWM_DIV(or));
@@ -188,7 +188,7 @@ nva3_set_intensity(struct backlight_device *bd) 
	struct nouveau_encoder *nv_encoder = bl_get_data(bd);

	struct nouveau_drm *drm = nouveau_drm(nv_encoder->base.base.dev);

	struct nvif_object *device = &drm->client.device.object;

	int or = nv_encoder->or;

	int or = ffs(nv_encoder->dcb->or) - 1;

	u32 div, val;



	div = nvif_rd32(device, NV50_PDISP_SOR_PWM_DIV(or));
@@ -228,7 +228,7 @@ nv50_backlight_init(struct drm_connector *connector) 
			return -ENODEV;

	}



	if (!nvif_rd32(device, NV50_PDISP_SOR_PWM_CTL(nv_encoder->or)))

	if (!nvif_rd32(device, NV50_PDISP_SOR_PWM_CTL(ffs(nv_encoder->dcb->or) - 1)))

		return 0;



	if (drm->client.device.info.chipset <= 0xa0 ||
@@ -268,13 +268,13 @@ nouveau_backlight_init(struct drm_device *dev) 
	struct nvif_device *device = &drm->client.device;

	struct drm_connector *connector;



	INIT_LIST_HEAD(&drm->bl_connectors);



	if (apple_gmux_present()) {

		NV_INFO(drm, "Apple GMUX detected: not registering Nouveau backlight interface\n");

		return 0;

	}



	INIT_LIST_HEAD(&drm->bl_connectors);



	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {

		if (connector->connector_type != DRM_MODE_CONNECTOR_LVDS &&

		    connector->connector_type != DRM_MODE_CONNECTOR_eDP)

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c

+1 −1
Original line number Diff line number Diff line
@@ -1354,7 +1354,7 @@ nvkm_vmm_get_locked(struct nvkm_vmm *vmm, bool getref, bool mapref, bool sparse, 


		tail = this->addr + this->size;

		if (vmm->func->page_block && next && next->page != p)

			tail = ALIGN_DOWN(addr, vmm->func->page_block);

			tail = ALIGN_DOWN(tail, vmm->func->page_block);



		if (addr <= tail && tail - addr >= size) {

			rb_erase(&this->tree, &vmm->free);