/* MEI/GSC interface is solid depending on which is used */
mutex_lock(&i915->display.hdcp.comp_mutex);
- if (!i915->display.hdcp.comp_added || !i915->display.hdcp.master) {
+ if (!i915->display.hdcp.comp_added || !i915->display.hdcp.arbiter) {
mutex_unlock(&i915->display.hdcp.comp_mutex);
return false;
}
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
struct drm_i915_private *i915 = to_i915(connector->base.dev);
- struct i915_hdcp_master *arbiter;
+ struct i915_hdcp_arbiter *arbiter;
int ret;
mutex_lock(&i915->display.hdcp.comp_mutex);
- arbiter = i915->display.hdcp.master;
+ arbiter = i915->display.hdcp.arbiter;
if (!arbiter || !arbiter->ops) {
mutex_unlock(&i915->display.hdcp.comp_mutex);
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
struct drm_i915_private *i915 = to_i915(connector->base.dev);
- struct i915_hdcp_master *arbiter;
+ struct i915_hdcp_arbiter *arbiter;
int ret;
mutex_lock(&i915->display.hdcp.comp_mutex);
- arbiter = i915->display.hdcp.master;
+ arbiter = i915->display.hdcp.arbiter;
if (!arbiter || !arbiter->ops) {
mutex_unlock(&i915->display.hdcp.comp_mutex);
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
struct drm_i915_private *i915 = to_i915(connector->base.dev);
- struct i915_hdcp_master *arbiter;
+ struct i915_hdcp_arbiter *arbiter;
int ret;
mutex_lock(&i915->display.hdcp.comp_mutex);
- arbiter = i915->display.hdcp.master;
+ arbiter = i915->display.hdcp.arbiter;
if (!arbiter || !arbiter->ops) {
mutex_unlock(&i915->display.hdcp.comp_mutex);
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
struct drm_i915_private *i915 = to_i915(connector->base.dev);
- struct i915_hdcp_master *arbiter;
+ struct i915_hdcp_arbiter *arbiter;
int ret;
mutex_lock(&i915->display.hdcp.comp_mutex);
- arbiter = i915->display.hdcp.master;
+ arbiter = i915->display.hdcp.arbiter;
if (!arbiter || !arbiter->ops) {
mutex_unlock(&i915->display.hdcp.comp_mutex);
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
struct drm_i915_private *i915 = to_i915(connector->base.dev);
- struct i915_hdcp_master *arbiter;
+ struct i915_hdcp_arbiter *arbiter;
int ret;
mutex_lock(&i915->display.hdcp.comp_mutex);
- arbiter = i915->display.hdcp.master;
+ arbiter = i915->display.hdcp.arbiter;
if (!arbiter || !arbiter->ops) {
mutex_unlock(&i915->display.hdcp.comp_mutex);
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
struct drm_i915_private *i915 = to_i915(connector->base.dev);
- struct i915_hdcp_master *arbiter;
+ struct i915_hdcp_arbiter *arbiter;
int ret;
mutex_lock(&i915->display.hdcp.comp_mutex);
- arbiter = i915->display.hdcp.master;
+ arbiter = i915->display.hdcp.arbiter;
if (!arbiter || !arbiter->ops) {
mutex_unlock(&i915->display.hdcp.comp_mutex);
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
struct drm_i915_private *i915 = to_i915(connector->base.dev);
- struct i915_hdcp_master *arbiter;
+ struct i915_hdcp_arbiter *arbiter;
int ret;
mutex_lock(&i915->display.hdcp.comp_mutex);
- arbiter = i915->display.hdcp.master;
+ arbiter = i915->display.hdcp.arbiter;
if (!arbiter || !arbiter->ops) {
mutex_unlock(&i915->display.hdcp.comp_mutex);
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
struct drm_i915_private *i915 = to_i915(connector->base.dev);
- struct i915_hdcp_master *arbiter;
+ struct i915_hdcp_arbiter *arbiter;
int ret;
mutex_lock(&i915->display.hdcp.comp_mutex);
- arbiter = i915->display.hdcp.master;
+ arbiter = i915->display.hdcp.arbiter;
if (!arbiter || !arbiter->ops) {
mutex_unlock(&i915->display.hdcp.comp_mutex);
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
struct drm_i915_private *i915 = to_i915(connector->base.dev);
- struct i915_hdcp_master *arbiter;
+ struct i915_hdcp_arbiter *arbiter;
int ret;
mutex_lock(&i915->display.hdcp.comp_mutex);
- arbiter = i915->display.hdcp.master;
+ arbiter = i915->display.hdcp.arbiter;
if (!arbiter || !arbiter->ops) {
mutex_unlock(&i915->display.hdcp.comp_mutex);
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
struct drm_i915_private *i915 = to_i915(connector->base.dev);
- struct i915_hdcp_master *arbiter;
+ struct i915_hdcp_arbiter *arbiter;
int ret;
mutex_lock(&i915->display.hdcp.comp_mutex);
- arbiter = i915->display.hdcp.master;
+ arbiter = i915->display.hdcp.arbiter;
if (!arbiter || !arbiter->ops) {
mutex_unlock(&i915->display.hdcp.comp_mutex);
{
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct drm_i915_private *i915 = to_i915(connector->base.dev);
- struct i915_hdcp_master *arbiter;
+ struct i915_hdcp_arbiter *arbiter;
int ret;
mutex_lock(&i915->display.hdcp.comp_mutex);
- arbiter = i915->display.hdcp.master;
+ arbiter = i915->display.hdcp.arbiter;
if (!arbiter || !arbiter->ops) {
mutex_unlock(&i915->display.hdcp.comp_mutex);
drm_dbg(&i915->drm, "I915 HDCP comp bind\n");
mutex_lock(&i915->display.hdcp.comp_mutex);
- i915->display.hdcp.master = (struct i915_hdcp_master *)data;
- i915->display.hdcp.master->hdcp_dev = mei_kdev;
+ i915->display.hdcp.arbiter = (struct i915_hdcp_arbiter *)data;
+ i915->display.hdcp.arbiter->hdcp_dev = mei_kdev;
mutex_unlock(&i915->display.hdcp.comp_mutex);
return 0;
drm_dbg(&i915->drm, "I915 HDCP comp unbind\n");
mutex_lock(&i915->display.hdcp.comp_mutex);
- i915->display.hdcp.master = NULL;
+ i915->display.hdcp.arbiter = NULL;
mutex_unlock(&i915->display.hdcp.comp_mutex);
}
static int mei_component_master_bind(struct device *dev)
{
struct mei_cl_device *cldev = to_mei_cl_device(dev);
- struct i915_hdcp_master *comp_master = mei_cldev_get_drvdata(cldev);
+ struct i915_hdcp_arbiter *comp_arbiter = mei_cldev_get_drvdata(cldev);
int ret;
dev_dbg(dev, "%s\n", __func__);
- comp_master->ops = &mei_hdcp_ops;
- comp_master->hdcp_dev = dev;
- ret = component_bind_all(dev, comp_master);
+ comp_arbiter->ops = &mei_hdcp_ops;
+ comp_arbiter->hdcp_dev = dev;
+ ret = component_bind_all(dev, comp_arbiter);
if (ret < 0)
return ret;
static void mei_component_master_unbind(struct device *dev)
{
struct mei_cl_device *cldev = to_mei_cl_device(dev);
- struct i915_hdcp_master *comp_master = mei_cldev_get_drvdata(cldev);
+ struct i915_hdcp_arbiter *comp_arbiter = mei_cldev_get_drvdata(cldev);
dev_dbg(dev, "%s\n", __func__);
- component_unbind_all(dev, comp_master);
+ component_unbind_all(dev, comp_arbiter);
}
static const struct component_master_ops mei_component_master_ops = {
static int mei_hdcp_probe(struct mei_cl_device *cldev,
const struct mei_cl_device_id *id)
{
- struct i915_hdcp_master *comp_master;
+ struct i915_hdcp_arbiter *comp_arbiter;
struct component_match *master_match;
int ret;
goto enable_err_exit;
}
- comp_master = kzalloc(sizeof(*comp_master), GFP_KERNEL);
- if (!comp_master) {
+ comp_arbiter = kzalloc(sizeof(*comp_arbiter), GFP_KERNEL);
+ if (!comp_arbiter) {
ret = -ENOMEM;
goto err_exit;
}
goto err_exit;
}
- mei_cldev_set_drvdata(cldev, comp_master);
+ mei_cldev_set_drvdata(cldev, comp_arbiter);
ret = component_master_add_with_match(&cldev->dev,
&mei_component_master_ops,
master_match);
err_exit:
mei_cldev_set_drvdata(cldev, NULL);
- kfree(comp_master);
+ kfree(comp_arbiter);
mei_cldev_disable(cldev);
enable_err_exit:
return ret;
static void mei_hdcp_remove(struct mei_cl_device *cldev)
{
- struct i915_hdcp_master *comp_master = mei_cldev_get_drvdata(cldev);
+ struct i915_hdcp_arbiter *comp_arbiter = mei_cldev_get_drvdata(cldev);
int ret;
component_master_del(&cldev->dev, &mei_component_master_ops);
- kfree(comp_master);
+ kfree(comp_arbiter);
mei_cldev_set_drvdata(cldev, NULL);
ret = mei_cldev_disable(cldev);