From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Subject: [PATCH v3 2.5/13] drm/i915: Remove unused dp properties for dp-mst.
Date: Mon, 10 Apr 2017 12:51:10 +0200 [thread overview]
Message-ID: <751b85a0-81cd-09e2-9e60-6d4ddbf1c6ac@linux.intel.com> (raw)
In-Reply-To: <1491815239-10685-4-git-send-email-maarten.lankhorst@linux.intel.com>
Those properties are not hooked up on MST and were ignored. Best not expose them at all.
Without this the next patch fails to start on X.org, because the DP-MST properties could
not be read.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index a146090b651b..42f62dcd2f3e 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -5054,7 +5054,7 @@ bool intel_dp_is_edp(struct drm_i915_private *dev_priv, enum port port)
return intel_bios_is_port_edp(dev_priv, port);
}
-void
+static void
intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connector)
{
intel_attach_force_audio_property(connector);
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 3fc345a76e6f..fb1cfdfa7fba 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -450,7 +450,6 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
drm_mode_connector_attach_encoder(&intel_connector->base,
&intel_dp->mst_encoders[i]->base.base);
}
- intel_dp_add_properties(intel_dp, connector);
drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0);
drm_object_attach_property(&connector->base, dev->mode_config.tile_property, 0);
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 1f9e92eb93da..b50196b7237d 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1503,7 +1503,6 @@ void intel_edp_backlight_off(struct intel_dp *intel_dp);
void intel_edp_panel_vdd_on(struct intel_dp *intel_dp);
void intel_edp_panel_on(struct intel_dp *intel_dp);
void intel_edp_panel_off(struct intel_dp *intel_dp);
-void intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connector);
void intel_dp_mst_suspend(struct drm_device *dev);
void intel_dp_mst_resume(struct drm_device *dev);
int intel_dp_max_link_rate(struct intel_dp *intel_dp);
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-04-10 10:51 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-10 9:07 [PATCH v3 00/13] drm/i915: Convert connector properties to atomic Maarten Lankhorst
2017-04-10 9:07 ` [PATCH v3 01/13] drm/i915: Remove unused members from intel_tv.c Maarten Lankhorst
2017-04-10 9:51 ` Chris Wilson
2017-04-10 9:07 ` [PATCH v3 02/13] drm/i915: Convert intel_tv connector properties to atomic, v5 Maarten Lankhorst
2017-04-10 9:07 ` [PATCH v3 03/13] drm/i915: Convert intel_dp_mst connector properties to atomic Maarten Lankhorst
2017-04-10 10:51 ` Maarten Lankhorst [this message]
2017-04-12 7:47 ` [PATCH v3 2.5/13] drm/i915: Remove unused dp properties for dp-mst Daniel Vetter
2017-04-10 9:07 ` [PATCH v3 04/13] drm/i915: Convert intel_crt connector properties to atomic Maarten Lankhorst
2017-04-12 7:48 ` Daniel Vetter
2017-04-10 9:07 ` [PATCH v3 05/13] drm/i915: Convert intel DVO connector " Maarten Lankhorst
2017-04-12 7:49 ` Daniel Vetter
2017-04-10 9:07 ` [PATCH v3 06/13] drm/i915: Add plumbing for digital connector state Maarten Lankhorst
2017-04-12 7:56 ` Daniel Vetter
2017-04-10 9:07 ` [PATCH v3 07/13] drm/i915: Convert DSI connector properties to atomic Maarten Lankhorst
2017-04-10 9:07 ` [PATCH v3 08/13] drm/i915: Convert LVDS " Maarten Lankhorst
2017-04-10 9:07 ` [PATCH v3 09/13] drm/i915: Make intel_dp->has_audio reflect hw state only Maarten Lankhorst
2017-04-10 9:07 ` [PATCH v3 10/13] drm/i915: Convert intel_dp properties to atomic Maarten Lankhorst
2017-04-10 9:07 ` [PATCH v3 11/13] drm/i915: Convert intel_hdmi connector " Maarten Lankhorst
2017-04-10 9:07 ` [PATCH v3 12/13] drm/i915: Handle force_audio correctly in intel_sdvo Maarten Lankhorst
2017-04-10 9:07 ` [PATCH v3 13/13] drm/i915: Convert intel_sdvo connector properties to atomic Maarten Lankhorst
2017-04-10 9:43 ` ✓ Fi.CI.BAT: success for drm/i915: Convert connector properties to atomic. (rev2) Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=751b85a0-81cd-09e2-9e60-6d4ddbf1c6ac@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox