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

Commit c1b60ece authored by Francisco Jerez's avatar Francisco Jerez Committed by Ben Skeggs
Browse files

drm/nouveau: Fix a few confusions between "chipset" and "card_type". 



Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 5bead799

drivers/gpu/drm/nouveau/nouveau_bios.c

+1 −1
Original line number Diff line number Diff line
@@ -6829,7 +6829,7 @@ nouveau_bios_posted(struct drm_device *dev) 
	struct drm_nouveau_private *dev_priv = dev->dev_private;

	unsigned htotal;



	if (dev_priv->chipset >= NV_50) {

	if (dev_priv->card_type >= NV_50) {

		if (NVReadVgaCrtc(dev, 0, 0x00) == 0 &&

		    NVReadVgaCrtc(dev, 0, 0x1a) == 0)

			return false;

drivers/gpu/drm/nouveau/nouveau_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ nouveau_i2c_find(struct drm_device *dev, int index) 
	if (index >= DCB_MAX_NUM_I2C_ENTRIES)

		return NULL;



	if (dev_priv->chipset >= NV_50 && (i2c->entry & 0x00000100)) {

	if (dev_priv->card_type >= NV_50 && (i2c->entry & 0x00000100)) {

		uint32_t reg = 0xe500, val;



		if (i2c->port_type == 6) {

drivers/gpu/drm/nouveau/nouveau_temp.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ nv40_temp_get(struct drm_device *dev) 
	int offset = sensor->offset_mult / sensor->offset_div;

	int core_temp;



	if (dev_priv->chipset >= 0x50) {

	if (dev_priv->card_type >= NV_50) {

		core_temp = nv_rd32(dev, 0x20008);

	} else {

		core_temp = nv_rd32(dev, 0x0015b4) & 0x1fff;