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

Commit 7b98040a authored by Dave Airlie's avatar Dave Airlie
Browse files

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

Nothing too crazy here, a couple of regression fixes + runpm/fbcon
race fix.

* 'linux-4.3' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/bios: fix OF loading
  drm/nouveau/fbcon: take runpm reference when userspace has an open fd
  drm/nouveau/nouveau: Disable AGP for SiS 761
  drm/nouveau/display: allow up to 16k width/height for fermi+
  drm/nouveau/bios: translate devinit pri/sec i2c bus to internal identifiers
parents 621bd0f6 25d29588

drivers/gpu/drm/nouveau/nouveau_display.c

+5 −1
Original line number Diff line number Diff line
@@ -469,9 +469,13 @@ nouveau_display_create(struct drm_device *dev) 
	if (drm->device.info.family < NV_DEVICE_INFO_V0_TESLA) {

		dev->mode_config.max_width = 4096;

		dev->mode_config.max_height = 4096;

	} else {

	} else

	if (drm->device.info.family < NV_DEVICE_INFO_V0_FERMI) {

		dev->mode_config.max_width = 8192;

		dev->mode_config.max_height = 8192;

	} else {

		dev->mode_config.max_width = 16384;

		dev->mode_config.max_height = 16384;

	}



	dev->mode_config.preferred_depth = 24;

drivers/gpu/drm/nouveau/nouveau_fbcon.c

+24 −0
Original line number Diff line number Diff line
@@ -178,8 +178,30 @@ nouveau_fbcon_sync(struct fb_info *info) 
	return 0;

}



static int

nouveau_fbcon_open(struct fb_info *info, int user)

{

	struct nouveau_fbdev *fbcon = info->par;

	struct nouveau_drm *drm = nouveau_drm(fbcon->dev);

	int ret = pm_runtime_get_sync(drm->dev->dev);

	if (ret < 0 && ret != -EACCES)

		return ret;

	return 0;

}



static int

nouveau_fbcon_release(struct fb_info *info, int user)

{

	struct nouveau_fbdev *fbcon = info->par;

	struct nouveau_drm *drm = nouveau_drm(fbcon->dev);

	pm_runtime_put(drm->dev->dev);

	return 0;

}



static struct fb_ops nouveau_fbcon_ops = {

	.owner = THIS_MODULE,

	.fb_open = nouveau_fbcon_open,

	.fb_release = nouveau_fbcon_release,

	.fb_check_var = drm_fb_helper_check_var,

	.fb_set_par = drm_fb_helper_set_par,

	.fb_fillrect = nouveau_fbcon_fillrect,
@@ -195,6 +217,8 @@ static struct fb_ops nouveau_fbcon_ops = { 


static struct fb_ops nouveau_fbcon_sw_ops = {

	.owner = THIS_MODULE,

	.fb_open = nouveau_fbcon_open,

	.fb_release = nouveau_fbcon_release,

	.fb_check_var = drm_fb_helper_check_var,

	.fb_set_par = drm_fb_helper_set_par,

	.fb_fillrect = drm_fb_helper_cfb_fillrect,

drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c

+6 −0
Original line number Diff line number Diff line
@@ -267,6 +267,12 @@ init_i2c(struct nvbios_init *init, int index) 
		index = NVKM_I2C_BUS_PRI;

		if (init->outp && init->outp->i2c_upper_default)

			index = NVKM_I2C_BUS_SEC;

	} else

	if (index == 0x80) {

		index = NVKM_I2C_BUS_PRI;

	} else

	if (index == 0x81) {

		index = NVKM_I2C_BUS_SEC;

	}



	bus = nvkm_i2c_bus_find(i2c, index);

drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h

+3 −0
Original line number Diff line number Diff line
@@ -8,7 +8,10 @@ struct nvbios_source { 
	void *(*init)(struct nvkm_bios *, const char *);

	void  (*fini)(void *);

	u32   (*read)(void *, u32 offset, u32 length, struct nvkm_bios *);

	u32   (*size)(void *);

	bool rw;

	bool ignore_checksum;

	bool no_pcir;

};



int nvbios_extend(struct nvkm_bios *, u32 length);

drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c

+18 −9
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ shadow_fetch(struct nvkm_bios *bios, struct shadow *mthd, u32 upto) 
		u32 read = mthd->func->read(data, start, limit - start, bios);

		bios->size = start + read;

	}

	return bios->size >= limit;

	return bios->size >= upto;

}



static int
@@ -55,8 +55,15 @@ shadow_image(struct nvkm_bios *bios, int idx, u32 offset, struct shadow *mthd) 
	struct nvbios_image image;

	int score = 1;



	if (mthd->func->no_pcir) {

		image.base = 0;

		image.type = 0;

		image.size = mthd->func->size(mthd->data);

		image.last = 1;

	} else {

		if (!shadow_fetch(bios, mthd, offset + 0x1000)) {

		nvkm_debug(subdev, "%08x: header fetch failed\n", offset);

			nvkm_debug(subdev, "%08x: header fetch failed\n",

				   offset);

			return 0;

		}
@@ -64,6 +71,7 @@ shadow_image(struct nvkm_bios *bios, int idx, u32 offset, struct shadow *mthd) 
			nvkm_debug(subdev, "image %d invalid\n", idx);

			return 0;

		}

	}

	nvkm_debug(subdev, "%08x: type %02x, %d bytes\n",

		   image.base, image.type, image.size);
@@ -74,7 +82,8 @@ shadow_image(struct nvkm_bios *bios, int idx, u32 offset, struct shadow *mthd) 


	switch (image.type) {

	case 0x00:

		if (nvbios_checksum(&bios->data[image.base], image.size)) {

		if (!mthd->func->ignore_checksum &&

		    nvbios_checksum(&bios->data[image.base], image.size)) {

			nvkm_debug(subdev, "%08x: checksum failed\n",

				   image.base);

			if (mthd->func->rw)