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

Commit 200819ab authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Remove unused dp properties for dp-mst. 



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: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/751b85a0-81cd-09e2-9e60-6d4ddbf1c6ac@linux.intel.com


Testcase: kms_properties
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 0e891b3f

drivers/gpu/drm/i915/intel_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -5145,7 +5145,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)

{

	struct intel_connector *intel_connector = to_intel_connector(connector);

drivers/gpu/drm/i915/intel_dp_mst.c

+0 −1
Original line number Diff line number Diff line
@@ -459,7 +459,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);

drivers/gpu/drm/i915/intel_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -1499,7 +1499,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);