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

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

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

* tag 'topic/drm-misc-2016-04-01' of git://anongit.freedesktop.org/drm-intel:
  drm: Add new DCS commands in the enum list
  drm: Make uapi headers C89 pendantic compliant
  drm/atomic: export drm_atomic_helper_wait_for_fences()
  drm: Untangle __KERNEL__ guards
  drm: Move DRM_MODE_OBJECT_* to uapi headers
  drm: align #include directives with libdrm in uapi headers
  drm: Make drm.h uapi header safe for C++
  vgacon: dummy implementation for vgacon_text_force
  drm/sysfs: Nuke TV/DVI property files
  drm/ttm: Remove TTM_HAS_AGP
  drm: bridge/dw-hdmi: Remove pre_enable/post_disable dummy funcs
  Revert "drm: Don't pass negative delta to ktime_sub_ns()"
  drm/atmel: Fixup drm_connector_/unplug/unregister/_all
  drm: Rename drm_connector_unplug_all() to drm_connector_unregister_all()
  drm: bridge: Make (pre/post) enable/disable callbacks optional
parents 9735a227 249c4f53

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

+0 −2
Original line number Diff line number Diff line
@@ -556,12 +556,10 @@ static struct pci_driver amdgpu_kms_pci_driver = { 
static int __init amdgpu_init(void)

{

	amdgpu_sync_init();

#ifdef CONFIG_VGA_CONSOLE

	if (vgacon_text_force()) {

		DRM_ERROR("VGACON disables amdgpu kernel modesetting.\n");

		return -EINVAL;

	}

#endif

	DRM_INFO("amdgpu kernel modesetting enabled.\n");

	driver = &kms_driver;

	pdriver = &amdgpu_kms_pci_driver;

drivers/gpu/drm/ast/ast_drv.c

+0 −2
Original line number Diff line number Diff line
@@ -218,10 +218,8 @@ static struct drm_driver driver = { 


static int __init ast_init(void)

{

#ifdef CONFIG_VGA_CONSOLE

	if (vgacon_text_force() && ast_modeset == -1)

		return -EINVAL;

#endif



	if (ast_modeset == 0)

		return -EINVAL;

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c

+1 −1
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ static int atmel_hlcdc_dc_connector_plug_all(struct drm_device *dev) 
static void atmel_hlcdc_dc_connector_unplug_all(struct drm_device *dev)

{

	mutex_lock(&dev->mode_config.mutex);

	drm_connector_unplug_all(dev);

	drm_connector_unregister_all(dev);

	mutex_unlock(&dev->mode_config.mutex);

}

drivers/gpu/drm/bridge/dw-hdmi.c

+0 −7
Original line number Diff line number Diff line
@@ -1413,11 +1413,6 @@ static void dw_hdmi_bridge_enable(struct drm_bridge *bridge) 
	mutex_unlock(&hdmi->mutex);

}



static void dw_hdmi_bridge_nop(struct drm_bridge *bridge)

{

	/* do nothing */

}



static enum drm_connector_status

dw_hdmi_connector_detect(struct drm_connector *connector, bool force)

{
@@ -1536,8 +1531,6 @@ static const struct drm_connector_helper_funcs dw_hdmi_connector_helper_funcs = 
static const struct drm_bridge_funcs dw_hdmi_bridge_funcs = {

	.enable = dw_hdmi_bridge_enable,

	.disable = dw_hdmi_bridge_disable,

	.pre_enable = dw_hdmi_bridge_nop,

	.post_disable = dw_hdmi_bridge_nop,

	.mode_set = dw_hdmi_bridge_mode_set,

};

drivers/gpu/drm/cirrus/cirrus_drv.c

+0 −2
Original line number Diff line number Diff line
@@ -163,10 +163,8 @@ static struct pci_driver cirrus_pci_driver = { 


static int __init cirrus_init(void)

{

#ifdef CONFIG_VGA_CONSOLE

	if (vgacon_text_force() && cirrus_modeset == -1)

		return -EINVAL;

#endif



	if (cirrus_modeset == 0)

		return -EINVAL;