summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_dp_mst.c
diff options
context:
space:
mode:
authorDaniel Vetter2014-10-22 11:06:44 +0200
committerDaniel Vetter2014-10-24 16:34:12 +0200
commitf7f3d48ac858e4d2f0c71f8479d4ea022a35dd9c (patch)
tree39b71be0e1cf57b4d4860448e90c3b5846cb565d /drivers/gpu/drm/i915/intel_dp_mst.c
parentdrm/i915: add runtime PM get/put call in i915_execlists (diff)
downloadkernel-qcow2-linux-f7f3d48ac858e4d2f0c71f8479d4ea022a35dd9c.tar.gz
kernel-qcow2-linux-f7f3d48ac858e4d2f0c71f8479d4ea022a35dd9c.tar.xz
kernel-qcow2-linux-f7f3d48ac858e4d2f0c71f8479d4ea022a35dd9c.zip
drm/i915: Fold in intel_mst_port_dp_detect
The indirection here seems to serve no purpose. Probably leftovers from earlier revisions. Spotted while trying to review some mst patches. Cc: Dave Airlie <airlied@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp_mst.c')
-rw-r--r--drivers/gpu/drm/i915/intel_dp_mst.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index d9a7a7865f66..b03fa9026a9c 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -278,7 +278,7 @@ static int intel_dp_mst_get_ddc_modes(struct drm_connector *connector)
}
static enum drm_connector_status
-intel_mst_port_dp_detect(struct drm_connector *connector)
+intel_dp_mst_detect(struct drm_connector *connector, bool force)
{
struct intel_connector *intel_connector = to_intel_connector(connector);
struct intel_dp *intel_dp = intel_connector->mst_port;
@@ -286,14 +286,6 @@ intel_mst_port_dp_detect(struct drm_connector *connector)
return drm_dp_mst_detect_port(&intel_dp->mst_mgr, intel_connector->port);
}
-static enum drm_connector_status
-intel_dp_mst_detect(struct drm_connector *connector, bool force)
-{
- enum drm_connector_status status;
- status = intel_mst_port_dp_detect(connector);
- return status;
-}
-
static int
intel_dp_mst_set_property(struct drm_connector *connector,
struct drm_property *property,