UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Remove redundant drm_connector_register_all() 

drm_connector_register_all() is now automatically called by
drm_dev_register(), and so we no longer have to do so ourselves (via
intel_modeset_register() after calling drm_dev_register()). Similarly
for unregistering.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1466773227-7994-8-git-send-email-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2016-06-24 14:00:20 +01:00
parent 3e783bac8a
commit 2e5673e73d
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/i915_dma.c
View File

@ -1403,7 +1403,6 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
if (drm_dev_register(dev, 0) == 0) {
i915_debugfs_register(dev_priv);
i915_setup_sysfs(dev);
intel_modeset_register(dev_priv);
} else
DRM_ERROR("Failed to register driver for userspace access!\n");
@ -1440,7 +1439,6 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)
acpi_video_unregister();
intel_opregion_unregister(dev_priv);
intel_modeset_unregister(dev_priv);
i915_teardown_sysfs(dev_priv->dev);
i915_debugfs_unregister(dev_priv);
drm_dev_unregister(dev_priv->dev);

2
drivers/gpu/drm/i915/i915_drv.h
View File

@ -3740,8 +3740,6 @@ extern void intel_modeset_init_hw(struct drm_device *dev);
extern void intel_modeset_init(struct drm_device *dev);
extern void intel_modeset_gem_init(struct drm_device *dev);
extern void intel_modeset_cleanup(struct drm_device *dev);
extern void intel_modeset_register(struct drm_i915_private *dev_priv);
extern void intel_modeset_unregister(struct drm_i915_private *dev_priv);
extern int intel_connector_register(struct drm_connector *);
extern void intel_connector_unregister(struct drm_connector *);
extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state);

10
drivers/gpu/drm/i915/intel_display.c
View File

@ -15551,16 +15551,6 @@ void intel_modeset_init_hw(struct drm_device *dev)
intel_enable_gt_powersave(dev_priv);
}
void intel_modeset_register(struct drm_i915_private *dev_priv)
{
drm_connector_register_all(dev_priv->dev);
}
void intel_modeset_unregister(struct drm_i915_private *dev_priv)
{
drm_connector_unregister_all(dev_priv->dev);
}
/*
* Calculate what we think the watermarks should be for the state we've read
* out of the hardware and then immediately program those watermarks so that