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

Commit 69a8ebfa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "A single radeon typo fix for a regressions and two fixes for a
  regression in the open helper address space stuff."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: fix typo in evergreen_mc_resume()
  drm: set dev_mapping before calling drm_open_helper
  drm: restore open_count if drm_setup fails
parents 3cc5a2ee 695ddeb4

drivers/gpu/drm/drm_fops.c

+30 −14
Original line number Diff line number Diff line
@@ -121,6 +121,8 @@ int drm_open(struct inode *inode, struct file *filp) 
	int minor_id = iminor(inode);

	struct drm_minor *minor;

	int retcode = 0;

	int need_setup = 0;

	struct address_space *old_mapping;



	minor = idr_find(&drm_minors_idr, minor_id);

	if (!minor)
@@ -132,23 +134,37 @@ int drm_open(struct inode *inode, struct file *filp) 
	if (drm_device_is_unplugged(dev))

		return -ENODEV;



	retcode = drm_open_helper(inode, filp, dev);

	if (!retcode) {

		atomic_inc(&dev->counts[_DRM_STAT_OPENS]);

	if (!dev->open_count++)

			retcode = drm_setup(dev);

	}

	if (!retcode) {

		need_setup = 1;

	mutex_lock(&dev->struct_mutex);

		if (dev->dev_mapping == NULL)

	old_mapping = dev->dev_mapping;

	if (old_mapping == NULL)

		dev->dev_mapping = &inode->i_data;

	/* ihold ensures nobody can remove inode with our i_data */

	ihold(container_of(dev->dev_mapping, struct inode, i_data));

	inode->i_mapping = dev->dev_mapping;

	filp->f_mapping = dev->dev_mapping;

	mutex_unlock(&dev->struct_mutex);



	retcode = drm_open_helper(inode, filp, dev);

	if (retcode)

		goto err_undo;

	atomic_inc(&dev->counts[_DRM_STAT_OPENS]);

	if (need_setup) {

		retcode = drm_setup(dev);

		if (retcode)

			goto err_undo;

	}

	return 0;



err_undo:

	mutex_lock(&dev->struct_mutex);

	filp->f_mapping = old_mapping;

	inode->i_mapping = old_mapping;

	iput(container_of(dev->dev_mapping, struct inode, i_data));

	dev->dev_mapping = old_mapping;

	mutex_unlock(&dev->struct_mutex);

	dev->open_count--;

	return retcode;

}

EXPORT_SYMBOL(drm_open);

drivers/gpu/drm/radeon/evergreen.c

+1 −1
Original line number Diff line number Diff line
@@ -1372,7 +1372,7 @@ void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *s 
	WREG32(BIF_FB_EN, FB_READ_EN | FB_WRITE_EN);



	for (i = 0; i < rdev->num_crtc; i++) {

		if (save->crtc_enabled) {

		if (save->crtc_enabled[i]) {

			if (ASIC_IS_DCE6(rdev)) {

				tmp = RREG32(EVERGREEN_CRTC_BLANK_CONTROL + crtc_offsets[i]);

				tmp |= EVERGREEN_CRTC_BLANK_DATA_EN;