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

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

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: add s/r quirk for Compaq Presario V5245EU
  drm/radeon/kms: evergreen & ni reset SPI block on CP resume
  drm: Fix the number of connector and encoder to cleanup functions
parents bd823821 302a8e8b

drivers/gpu/drm/drm_crtc.c

+2 −0
Original line number Diff line number Diff line
@@ -499,6 +499,7 @@ void drm_connector_cleanup(struct drm_connector *connector) 
	mutex_lock(&dev->mode_config.mutex);

	drm_mode_object_put(dev, &connector->base);

	list_del(&connector->head);

	dev->mode_config.num_connector--;

	mutex_unlock(&dev->mode_config.mutex);

}

EXPORT_SYMBOL(drm_connector_cleanup);
@@ -529,6 +530,7 @@ void drm_encoder_cleanup(struct drm_encoder *encoder) 
	mutex_lock(&dev->mode_config.mutex);

	drm_mode_object_put(dev, &encoder->base);

	list_del(&encoder->head);

	dev->mode_config.num_encoder--;

	mutex_unlock(&dev->mode_config.mutex);

}

EXPORT_SYMBOL(drm_encoder_cleanup);

drivers/gpu/drm/radeon/evergreen.c

+1 −0
Original line number Diff line number Diff line
@@ -1357,6 +1357,7 @@ int evergreen_cp_resume(struct radeon_device *rdev) 
				 SOFT_RESET_PA |

				 SOFT_RESET_SH |

				 SOFT_RESET_VGT |

				 SOFT_RESET_SPI |

				 SOFT_RESET_SX));

	RREG32(GRBM_SOFT_RESET);

	mdelay(15);

drivers/gpu/drm/radeon/ni.c

+1 −0
Original line number Diff line number Diff line
@@ -1159,6 +1159,7 @@ int cayman_cp_resume(struct radeon_device *rdev) 
				 SOFT_RESET_PA |

				 SOFT_RESET_SH |

				 SOFT_RESET_VGT |

				 SOFT_RESET_SPI |

				 SOFT_RESET_SX));

	RREG32(GRBM_SOFT_RESET);

	mdelay(15);

drivers/gpu/drm/radeon/radeon_combios.c

+8 −0
Original line number Diff line number Diff line
@@ -3298,6 +3298,14 @@ void radeon_combios_asic_init(struct drm_device *dev) 
	    rdev->pdev->subsystem_device == 0x30a4)

		return;



	/* quirk for rs4xx Compaq Presario V5245EU laptop to make it resume

	 * - it hangs on resume inside the dynclk 1 table.

	 */

	if (rdev->family == CHIP_RS480 &&

	    rdev->pdev->subsystem_vendor == 0x103c &&

	    rdev->pdev->subsystem_device == 0x30ae)

		return;



	/* DYN CLK 1 */

	table = combios_get_table_offset(dev, COMBIOS_DYN_CLK_1_TABLE);

	if (table)