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

Commit acc5ddd9 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2016-12-08' of git://anongit.freedesktop.org/git/drm-misc into drm-next 

Another pile of misc stuff, final one for 4.10. If there's some serious
bugfix still I'll send you a pull for drm-misc-next-fixes (like we do with
intel), otherwise this is it and next pull next year for 4.11.

Most interesting bits are probably Chris' fb helper fixes against mst
hotplug oopses.

* tag 'drm-misc-next-2016-12-08' of git://anongit.freedesktop.org/git/drm-misc: (22 commits)
  drm: Take ownership of the dmabuf->obj when exporting
  drm: Allow CAP_PRIME on !MODESET
  drm/fence: add drm_crtc_create_fence()
  drm/bridge: analogix: Don't return -EINVAL when panel doesn't support PSR
  drm/atomic: doc: remove old comment about nonblocking commits
  drm: Don't block the kworker waiting for mode_config.mutex in output_poll()
  drm: Return -ENOTSUPP when called for KMS cap with a non-KMS driver
  drm/amdgpu: don't add files at control minor debugfs directory
  drm: allow changing DPMS mode
  drm/qxl: fix use of uninitialized variable
  drm/qxl: Don't register debugfs for control minors
  drm/radeon: don't add files at control minor debugfs directory
  drm/vmwgfx: Switch to mode_cmd2
  drm/vgem: Use ww_mutex_(un)lock even with a NULL context
  drm: Make the connector .detect() callback optional
  drm/bridge: tc358767: don't warn if display side ASSR enable fails
  drm: Initialise drm_mm.head_node.allocated
  drm: Fix locking cargo-cult in encoder/plane init/cleanup
  drm/doc: Fix indenting in drm_modeset_lock.c comment
  drm: Protect fb_helper list manipulation with a mutex
  ...
parents bfd5be0f 72a93e8d

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

+0 −6
Original line number Diff line number Diff line
@@ -2498,9 +2498,6 @@ int amdgpu_debugfs_add_files(struct amdgpu_device *adev, 
	adev->debugfs[adev->debugfs_count].num_files = nfiles;

	adev->debugfs_count = i;

#if defined(CONFIG_DEBUG_FS)

	drm_debugfs_create_files(files, nfiles,

				 adev->ddev->control->debugfs_root,

				 adev->ddev->control);

	drm_debugfs_create_files(files, nfiles,

				 adev->ddev->primary->debugfs_root,

				 adev->ddev->primary);
@@ -2514,9 +2511,6 @@ static void amdgpu_debugfs_remove_files(struct amdgpu_device *adev) 
	unsigned i;



	for (i = 0; i < adev->debugfs_count; i++) {

		drm_debugfs_remove_files(adev->debugfs[i].files,

					 adev->debugfs[i].num_files,

					 adev->ddev->control);

		drm_debugfs_remove_files(adev->debugfs[i].files,

					 adev->debugfs[i].num_files,

					 adev->ddev->primary);

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

+0 −7
Original line number Diff line number Diff line
@@ -424,12 +424,6 @@ dce_virtual_dpms(struct drm_connector *connector, int mode) 
	return 0;

}



static enum drm_connector_status

dce_virtual_detect(struct drm_connector *connector, bool force)

{

	return connector_status_connected;

}



static int

dce_virtual_set_property(struct drm_connector *connector,

			 struct drm_property *property,
@@ -458,7 +452,6 @@ static const struct drm_connector_helper_funcs dce_virtual_connector_helper_func 


static const struct drm_connector_funcs dce_virtual_connector_funcs = {

	.dpms = dce_virtual_dpms,

	.detect = dce_virtual_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.set_property = dce_virtual_set_property,

	.destroy = dce_virtual_destroy,

drivers/gpu/drm/arc/arcpgu_sim.c

+0 −7
Original line number Diff line number Diff line
@@ -41,12 +41,6 @@ static int arcpgu_drm_connector_get_modes(struct drm_connector *connector) 
	return count;

}



static enum drm_connector_status

arcpgu_drm_connector_detect(struct drm_connector *connector, bool force)

{

	return connector_status_connected;

}



static void arcpgu_drm_connector_destroy(struct drm_connector *connector)

{

	drm_connector_unregister(connector);
@@ -61,7 +55,6 @@ arcpgu_drm_connector_helper_funcs = { 
static const struct drm_connector_funcs arcpgu_drm_connector_funcs = {

	.dpms = drm_helper_connector_dpms,

	.reset = drm_atomic_helper_connector_reset,

	.detect = arcpgu_drm_connector_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.destroy = arcpgu_drm_connector_destroy,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

drivers/gpu/drm/ast/ast_mode.c

+0 −7
Original line number Diff line number Diff line
@@ -839,12 +839,6 @@ static void ast_connector_destroy(struct drm_connector *connector) 
	kfree(connector);

}



static enum drm_connector_status

ast_connector_detect(struct drm_connector *connector, bool force)

{

	return connector_status_connected;

}



static const struct drm_connector_helper_funcs ast_connector_helper_funcs = {

	.mode_valid = ast_mode_valid,

	.get_modes = ast_get_modes,
@@ -853,7 +847,6 @@ static const struct drm_connector_helper_funcs ast_connector_helper_funcs = { 


static const struct drm_connector_funcs ast_connector_funcs = {

	.dpms = drm_helper_connector_dpms,

	.detect = ast_connector_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.destroy = ast_connector_destroy,

};

drivers/gpu/drm/bochs/bochs_kms.c

+0 −7
Original line number Diff line number Diff line
@@ -216,12 +216,6 @@ bochs_connector_best_encoder(struct drm_connector *connector) 
	return NULL;

}



static enum drm_connector_status bochs_connector_detect(struct drm_connector

							*connector, bool force)

{

	return connector_status_connected;

}



static const struct drm_connector_helper_funcs bochs_connector_connector_helper_funcs = {

	.get_modes = bochs_connector_get_modes,

	.mode_valid = bochs_connector_mode_valid,
@@ -230,7 +224,6 @@ static const struct drm_connector_helper_funcs bochs_connector_connector_helper_ 


static const struct drm_connector_funcs bochs_connector_connector_funcs = {

	.dpms = drm_helper_connector_dpms,

	.detect = bochs_connector_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.destroy = drm_connector_cleanup,

};