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

Commit 8de9e417 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'connector-to-object-prop' of git://github.com/robclark/kernel-omap4 into drm-next 

* 'connector-to-object-prop' of git://github.com/robclark/kernel-omap4:
  drm: remove legacy drm_connector_property fxns
  drm/nouveau: drm_connector_property -> drm_object_property
  drm/i915: One more drm_connector_property -> drm_object_property
  drm/i2c: drm_connector_property -> drm_object_property
  drm/vmwgfx: drm_connector_property -> drm_object_property
  drm/udl: drm_connector_property -> drm_object_property
  drm/shmob: drm_connector_property -> drm_object_property
  drm/radeon: drm_connector_property -> drm_object_property
  drm/gma500: drm_connector_property -> drm_object_property
parents 00f09afd 58495563

drivers/gpu/drm/drm_crtc.c

+5 −26
Original line number Diff line number Diff line
@@ -559,11 +559,11 @@ int drm_connector_init(struct drm_device *dev, 
	dev->mode_config.num_connector++;



	if (connector_type != DRM_MODE_CONNECTOR_VIRTUAL)

		drm_connector_attach_property(connector,

		drm_object_attach_property(&connector->base,

					      dev->mode_config.edid_property,

					      0);



	drm_connector_attach_property(connector,

	drm_object_attach_property(&connector->base,

				      dev->mode_config.dpms_property, 0);



 out:
@@ -2928,27 +2928,6 @@ void drm_property_destroy(struct drm_device *dev, struct drm_property *property) 
}

EXPORT_SYMBOL(drm_property_destroy);



void drm_connector_attach_property(struct drm_connector *connector,

			       struct drm_property *property, uint64_t init_val)

{

	drm_object_attach_property(&connector->base, property, init_val);

}

EXPORT_SYMBOL(drm_connector_attach_property);



int drm_connector_property_set_value(struct drm_connector *connector,

				  struct drm_property *property, uint64_t value)

{

	return drm_object_property_set_value(&connector->base, property, value);

}

EXPORT_SYMBOL(drm_connector_property_set_value);



int drm_connector_property_get_value(struct drm_connector *connector,

				  struct drm_property *property, uint64_t *val)

{

	return drm_object_property_get_value(&connector->base, property, val);

}

EXPORT_SYMBOL(drm_connector_property_get_value);



void drm_object_attach_property(struct drm_mode_object *obj,

				struct drm_property *property,

				uint64_t init_val)
@@ -3185,7 +3164,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector, 
	/* Delete edid, when there is none. */

	if (!edid) {

		connector->edid_blob_ptr = NULL;

		ret = drm_connector_property_set_value(connector, dev->mode_config.edid_property, 0);

		ret = drm_object_property_set_value(&connector->base, dev->mode_config.edid_property, 0);

		return ret;

	}
@@ -3195,7 +3174,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector, 
	if (!connector->edid_blob_ptr)

		return -EINVAL;



	ret = drm_connector_property_set_value(connector,

	ret = drm_object_property_set_value(&connector->base,

					       dev->mode_config.edid_property,

					       connector->edid_blob_ptr->base.id);
@@ -3262,7 +3241,7 @@ static int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj, 


	/* store the property value if successful */

	if (!ret)

		drm_connector_property_set_value(connector, property, value);

		drm_object_property_set_value(&connector->base, property, value);

	return ret;

}

drivers/gpu/drm/drm_fb_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode) 
		for (j = 0; j < fb_helper->connector_count; j++) {

			connector = fb_helper->connector_info[j]->connector;

			connector->funcs->dpms(connector, dpms_mode);

			drm_connector_property_set_value(connector,

			drm_object_property_set_value(&connector->base,

				dev->mode_config.dpms_property, dpms_mode);

		}

	}

drivers/gpu/drm/drm_sysfs.c

+3 −3
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static ssize_t dpms_show(struct device *device, 
	uint64_t dpms_status;

	int ret;



	ret = drm_connector_property_get_value(connector,

	ret = drm_object_property_get_value(&connector->base,

					    dev->mode_config.dpms_property,

					    &dpms_status);

	if (ret)
@@ -277,7 +277,7 @@ static ssize_t subconnector_show(struct device *device, 
		return 0;

	}



	ret = drm_connector_property_get_value(connector, prop, &subconnector);

	ret = drm_object_property_get_value(&connector->base, prop, &subconnector);

	if (ret)

		return 0;
@@ -318,7 +318,7 @@ static ssize_t select_subconnector_show(struct device *device, 
		return 0;

	}



	ret = drm_connector_property_get_value(connector, prop, &subconnector);

	ret = drm_object_property_get_value(&connector->base, prop, &subconnector);

	if (ret)

		return 0;

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;