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

Commit a69ac9ea authored by Rob Clark's avatar Rob Clark Committed by Rob Clark
Browse files

drm/gma500: drm_connector_property -> drm_object_property 



Signed-off-by: default avatarRob Clark <rob@ti.com>
parent 7136470d

drivers/gpu/drm/gma500/cdv_device.c

+2 −2
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ void cdv_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);

}
@@ -553,7 +553,7 @@ void cdv_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);

}



/* Cedarview */

drivers/gpu/drm/gma500/cdv_intel_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -1650,7 +1650,7 @@ cdv_intel_dp_set_property(struct drm_connector *connector, 
	struct cdv_intel_dp *intel_dp = encoder->dev_priv;

	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/gma500/cdv_intel_hdmi.c

+3 −3
Original line number Diff line number Diff line
@@ -185,14 +185,14 @@ static int cdv_hdmi_set_property(struct drm_connector *connector, 
			return -1;

		}



		if (drm_connector_property_get_value(connector,

		if (drm_object_property_get_value(&connector->base,

							property, &curValue))

			return -1;



		if (curValue == value)

			return 0;



		if (drm_connector_property_set_value(connector,

		if (drm_object_property_set_value(&connector->base,

							property, value))

			return -1;
@@ -341,7 +341,7 @@ void cdv_hdmi_init(struct drm_device *dev, 
	connector->interlace_allowed = false;

	connector->doublescan_allowed = false;



	drm_connector_attach_property(connector,

	drm_object_attach_property(&connector->base,

				      dev->mode_config.scaling_mode_property,

				      DRM_MODE_SCALE_FULLSCREEN);

drivers/gpu/drm/gma500/cdv_intel_lvds.c

+5 −5
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ static int cdv_intel_lvds_set_property(struct drm_connector *connector, 
			return -1;

		}



		if (drm_connector_property_get_value(connector,

		if (drm_object_property_get_value(&connector->base,

						     property,

						     &curValue))

			return -1;
@@ -487,7 +487,7 @@ static int cdv_intel_lvds_set_property(struct drm_connector *connector, 
		if (curValue == value)

			return 0;



		if (drm_connector_property_set_value(connector,

		if (drm_object_property_set_value(&connector->base,

							property,

							value))

			return -1;
@@ -502,7 +502,7 @@ static int cdv_intel_lvds_set_property(struct drm_connector *connector, 
				return -1;

		}

	} else if (!strcmp(property->name, "backlight") && encoder) {

		if (drm_connector_property_set_value(connector,

		if (drm_object_property_set_value(&connector->base,

							property,

							value))

			return -1;
@@ -671,10 +671,10 @@ void cdv_intel_lvds_init(struct drm_device *dev, 
	connector->doublescan_allowed = false;



	/*Attach connector properties*/

	drm_connector_attach_property(connector,

	drm_object_attach_property(&connector->base,

				      dev->mode_config.scaling_mode_property,

				      DRM_MODE_SCALE_FULLSCREEN);

	drm_connector_attach_property(connector,

	drm_object_attach_property(&connector->base,

				      dev_priv->backlight_property,

				      BRIGHTNESS_MAX_LEVEL);

drivers/gpu/drm/gma500/mdfld_dsi_output.c

+5 −5
Original line number Diff line number Diff line
@@ -265,13 +265,13 @@ static int mdfld_dsi_connector_set_property(struct drm_connector *connector, 
			goto set_prop_error;

		}



		if (drm_connector_property_get_value(connector, property, &val))

		if (drm_object_property_get_value(&connector->base, property, &val))

			goto set_prop_error;



		if (val == value)

			goto set_prop_done;



		if (drm_connector_property_set_value(connector,

		if (drm_object_property_set_value(&connector->base,

							property, value))

			goto set_prop_error;
@@ -296,7 +296,7 @@ static int mdfld_dsi_connector_set_property(struct drm_connector *connector, 
			}

		}

	} else if (!strcmp(property->name, "backlight") && encoder) {

		if (drm_connector_property_set_value(connector, property,

		if (drm_object_property_set_value(&connector->base, property,

									value))

			goto set_prop_error;

		else
@@ -572,10 +572,10 @@ void mdfld_dsi_output_init(struct drm_device *dev, 
	connector->doublescan_allowed = false;



	/*attach properties*/

	drm_connector_attach_property(connector,

	drm_object_attach_property(&connector->base,

				dev->mode_config.scaling_mode_property,

				DRM_MODE_SCALE_FULLSCREEN);

	drm_connector_attach_property(connector,

	drm_object_attach_property(&connector->base,

				dev_priv->backlight_property,

				MDFLD_DSI_BRIGHTNESS_MAX_LEVEL);