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

Commit 662595df authored by Rob Clark's avatar Rob Clark Committed by Daniel Vetter
Browse files

drm/i915: drm_connector_property -> drm_object_property 



v2: Rebased.

Signed-off-by: default avatarRob Clark <rob@ti.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com> (v1)
[danvet: Pimp commit message a bit.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 45a066eb

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -7607,7 +7607,7 @@ intel_modeset_update_state(struct drm_device *dev, unsigned prepare_pipes) 
				dev->mode_config.dpms_property;



			connector->dpms = DRM_MODE_DPMS_ON;

			drm_connector_property_set_value(connector,

			drm_object_property_set_value(&connector->base,

							 dpms_property,

							 DRM_MODE_DPMS_ON);

drivers/gpu/drm/i915/intel_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -2393,7 +2393,7 @@ intel_dp_set_property(struct drm_connector *connector, 
	struct intel_dp *intel_dp = enc_to_intel_dp(&intel_encoder->base);

	int ret;



	ret = drm_connector_property_set_value(connector, property, val);

	ret = drm_object_property_set_value(&connector->base, property, val);

	if (ret)

		return ret;

drivers/gpu/drm/i915/intel_hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -874,7 +874,7 @@ intel_hdmi_set_property(struct drm_connector *connector, 
	struct drm_i915_private *dev_priv = connector->dev->dev_private;

	int ret;



	ret = drm_connector_property_set_value(connector, property, val);

	ret = drm_object_property_set_value(&connector->base, property, val);

	if (ret)

		return ret;

drivers/gpu/drm/i915/intel_lvds.c

+1 −1
Original line number Diff line number Diff line
@@ -1016,7 +1016,7 @@ bool intel_lvds_init(struct drm_device *dev) 


	/* create the scaling mode property */

	drm_mode_create_scaling_mode_property(dev);

	drm_connector_attach_property(&intel_connector->base,

	drm_object_attach_property(&connector->base,

				      dev->mode_config.scaling_mode_property,

				      DRM_MODE_SCALE_ASPECT);

	intel_connector->panel.fitting_mode = DRM_MODE_SCALE_ASPECT;

drivers/gpu/drm/i915/intel_modes.c

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ intel_attach_force_audio_property(struct drm_connector *connector) 


		dev_priv->force_audio_property = prop;

	}

	drm_connector_attach_property(connector, prop, 0);

	drm_object_attach_property(&connector->base, prop, 0);

}



static const struct drm_prop_enum_list broadcast_rgb_names[] = {
@@ -124,5 +124,5 @@ intel_attach_broadcast_rgb_property(struct drm_connector *connector) 
		dev_priv->broadcast_rgb_property = prop;

	}



	drm_connector_attach_property(connector, prop, 0);

	drm_object_attach_property(&connector->base, prop, 0);

}