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

Commit 2b8f01f1 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'topic/drm-misc-2016-04-29' of git://anongit.freedesktop.org/drm-intel into drm-next 

- prep work for struct_mutex-less gem_free_object
- more invasive/tricky mst fixes from Lyude for broken hw. I discussed
  this with Ville/Jani and we all agreed more soaking in -next would be
  real good this late in the -rc cycle. They're cc: stable too to make
  sure they're not getting lost. Feel free to cherry-pick those four if
  you disagree.
- few small things all over

* tag 'topic/drm-misc-2016-04-29' of git://anongit.freedesktop.org/drm-intel:
  drm/atomic: Add missing drm_crtc_internal.h include
  drm/dp: Allow signals to interrupt drm_aux-dev reads/writes
  drm: Quiet down drm_mode_getresources
  drm: Quiet down drm_mode_getconnector
  drm: Protect dev->filelist with its own mutex
  drm: Make drm_vm_open/close_locked private to drm_vm.c
  drm: Hide master MAP cleanup in drm_bufs.c
  drm: Forbid legacy MAP functions for DRIVER_MODESET
  drm: Push struct_mutex into ->master_destroy
  drm: Move drm_getmap into drm_bufs.c and give it a legacy prefix
  drm: Put legacy lastclose work into drm_legacy_dev_reinit
  drm: Give drm_agp_clear drm_legacy_ prefix
  drm/sysfs: Annote lockless show functions with READ_ONCE
  MAINTAINERS: Update the files list for the GMA500 DRM driver
  drm: rcar-du: Fix compilation warning
  drm/i915: Get rid of intel_dp_dpcd_read_wake()
  drm/dp_helper: Perform throw-away read before actual read in drm_dp_dpcd_read()
  drm/dp_helper: Retry aux transactions on all errors
  drm/dp_helper: Always wait before retrying native aux transactions
parents fffb6751 be35f94f

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -3851,8 +3851,7 @@ M: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> 
L:	dri-devel@lists.freedesktop.org

T:	git git://github.com/patjak/drm-gma500

S:	Maintained

F:	drivers/gpu/drm/gma500

F:	include/drm/gma500*

F:	drivers/gpu/drm/gma500/



DRM DRIVERS FOR NVIDIA TEGRA

M:	Thierry Reding <thierry.reding@gmail.com>

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c

+5 −5
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ void amdgpu_gem_force_release(struct amdgpu_device *adev) 
	struct drm_device *ddev = adev->ddev;

	struct drm_file *file;



	mutex_lock(&ddev->struct_mutex);

	mutex_lock(&ddev->filelist_mutex);



	list_for_each_entry(file, &ddev->filelist, lhead) {

		struct drm_gem_object *gobj;
@@ -103,13 +103,13 @@ void amdgpu_gem_force_release(struct amdgpu_device *adev) 
		spin_lock(&file->table_lock);

		idr_for_each_entry(&file->object_idr, gobj, handle) {

			WARN_ONCE(1, "And also active allocations!\n");

			drm_gem_object_unreference(gobj);

			drm_gem_object_unreference_unlocked(gobj);

		}

		idr_destroy(&file->object_idr);

		spin_unlock(&file->table_lock);

	}



	mutex_unlock(&ddev->struct_mutex);

	mutex_unlock(&ddev->filelist_mutex);

}



/*
@@ -769,7 +769,7 @@ static int amdgpu_debugfs_gem_info(struct seq_file *m, void *data) 
	struct drm_file *file;

	int r;



	r = mutex_lock_interruptible(&dev->struct_mutex);

	r = mutex_lock_interruptible(&dev->filelist_mutex);

	if (r)

		return r;
@@ -793,7 +793,7 @@ static int amdgpu_debugfs_gem_info(struct seq_file *m, void *data) 
		spin_unlock(&file->table_lock);

	}



	mutex_unlock(&dev->struct_mutex);

	mutex_unlock(&dev->filelist_mutex);

	return 0;

}

drivers/gpu/drm/drm_agpsupport.c

+2 −2
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ struct drm_agp_head *drm_agp_init(struct drm_device *dev) 
}



/**

 * drm_agp_clear - Clear AGP resource list

 * drm_legacy_agp_clear - Clear AGP resource list

 * @dev: DRM device

 *

 * Iterate over all AGP resources and remove them. But keep the AGP head
@@ -434,7 +434,7 @@ struct drm_agp_head *drm_agp_init(struct drm_device *dev) 
 * resources from getting destroyed. Drivers are responsible of cleaning them up

 * during device shutdown.

 */

void drm_agp_clear(struct drm_device *dev)

void drm_legacy_agp_clear(struct drm_device *dev)

{

	struct drm_agp_mem *entry, *tempe;

drivers/gpu/drm/drm_atomic.c

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
#include <drm/drm_mode.h>

#include <drm/drm_plane_helper.h>



#include "drm_crtc_internal.h"



/**

 * drm_atomic_state_default_release -

 * release memory initialized by drm_atomic_state_init

drivers/gpu/drm/drm_bufs.c

+86 −5
Original line number Diff line number Diff line
@@ -396,6 +396,10 @@ int drm_legacy_addmap_ioctl(struct drm_device *dev, void *data, 
	if (!(capable(CAP_SYS_ADMIN) || map->type == _DRM_AGP || map->type == _DRM_SHM))

		return -EPERM;



	if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) &&

	    drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	err = drm_addmap_core(dev, map->offset, map->size, map->type,

			      map->flags, &maplist);
@@ -416,6 +420,62 @@ int drm_legacy_addmap_ioctl(struct drm_device *dev, void *data, 
	return 0;

}



/*

 * Get a mapping information.

 *

 * \param inode device inode.

 * \param file_priv DRM file private.

 * \param cmd command.

 * \param arg user argument, pointing to a drm_map structure.

 *

 * \return zero on success or a negative number on failure.

 *

 * Searches for the mapping with the specified offset and copies its information

 * into userspace

 */

int drm_legacy_getmap_ioctl(struct drm_device *dev, void *data,

			    struct drm_file *file_priv)

{

	struct drm_map *map = data;

	struct drm_map_list *r_list = NULL;

	struct list_head *list;

	int idx;

	int i;



	if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) &&

	    drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	idx = map->offset;

	if (idx < 0)

		return -EINVAL;



	i = 0;

	mutex_lock(&dev->struct_mutex);

	list_for_each(list, &dev->maplist) {

		if (i == idx) {

			r_list = list_entry(list, struct drm_map_list, head);

			break;

		}

		i++;

	}

	if (!r_list || !r_list->map) {

		mutex_unlock(&dev->struct_mutex);

		return -EINVAL;

	}



	map->offset = r_list->map->offset;

	map->size = r_list->map->size;

	map->type = r_list->map->type;

	map->flags = r_list->map->flags;

	map->handle = (void *)(unsigned long) r_list->user_token;

	map->mtrr = arch_phys_wc_index(r_list->map->mtrr);



	mutex_unlock(&dev->struct_mutex);



	return 0;

}



/**

 * Remove a map private from list and deallocate resources if the mapping

 * isn't in use.
@@ -482,18 +542,35 @@ int drm_legacy_rmmap_locked(struct drm_device *dev, struct drm_local_map *map) 
}

EXPORT_SYMBOL(drm_legacy_rmmap_locked);



int drm_legacy_rmmap(struct drm_device *dev, struct drm_local_map *map)

void drm_legacy_rmmap(struct drm_device *dev, struct drm_local_map *map)

{

	int ret;

	if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) &&

	    drm_core_check_feature(dev, DRIVER_MODESET))

		return;



	mutex_lock(&dev->struct_mutex);

	ret = drm_legacy_rmmap_locked(dev, map);

	drm_legacy_rmmap_locked(dev, map);

	mutex_unlock(&dev->struct_mutex);



	return ret;

}

EXPORT_SYMBOL(drm_legacy_rmmap);



void drm_legacy_master_rmmaps(struct drm_device *dev, struct drm_master *master)

{

	struct drm_map_list *r_list, *list_temp;



	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return;



	mutex_lock(&dev->struct_mutex);

	list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head) {

		if (r_list->master == master) {

			drm_legacy_rmmap_locked(dev, r_list->map);

			r_list = NULL;

		}

	}

	mutex_unlock(&dev->struct_mutex);

}



/* The rmmap ioctl appears to be unnecessary.  All mappings are torn down on

 * the last close of the device, and this is necessary for cleanup when things

 * exit uncleanly.  Therefore, having userland manually remove mappings seems
@@ -517,6 +594,10 @@ int drm_legacy_rmmap_ioctl(struct drm_device *dev, void *data, 
	struct drm_map_list *r_list;

	int ret;



	if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) &&

	    drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	mutex_lock(&dev->struct_mutex);

	list_for_each_entry(r_list, &dev->maplist, head) {

		if (r_list->map &&