a4dd90b1cb
drm_edid_to_eld() sets ELD connector type since commit1d1c366507("drm/edid: set ELD connector type in drm_edid_to_eld()"). Remove the redundant update. (Commitc945b8c14b("drm/edid: build ELD in drm_add_edid_modes()") and commitd471ed04b4("drm/drivers: drop redundant drm_edid_to_eld() calls") are also related.) v2: Rebase, update commit message with commit references. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Acked-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20171229125547.28672-1-jani.nikula@intel.com
136 lines
3.9 KiB
C
136 lines
3.9 KiB
C
/*
|
|
* Copyright (c) 2007 Dave Airlie <airlied@linux.ie>
|
|
* Copyright (c) 2007, 2010 Intel Corporation
|
|
* Jesse Barnes <jesse.barnes@intel.com>
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
#include <linux/slab.h>
|
|
#include <linux/i2c.h>
|
|
#include <drm/drm_edid.h>
|
|
#include <drm/drmP.h>
|
|
#include "intel_drv.h"
|
|
#include "i915_drv.h"
|
|
|
|
/**
|
|
* intel_connector_update_modes - update connector from edid
|
|
* @connector: DRM connector device to use
|
|
* @edid: previously read EDID information
|
|
*/
|
|
int intel_connector_update_modes(struct drm_connector *connector,
|
|
struct edid *edid)
|
|
{
|
|
int ret;
|
|
|
|
drm_mode_connector_update_edid_property(connector, edid);
|
|
ret = drm_add_edid_modes(connector, edid);
|
|
|
|
return ret;
|
|
}
|
|
|
|
/**
|
|
* intel_ddc_get_modes - get modelist from monitor
|
|
* @connector: DRM connector device to use
|
|
* @adapter: i2c adapter
|
|
*
|
|
* Fetch the EDID information from @connector using the DDC bus.
|
|
*/
|
|
int intel_ddc_get_modes(struct drm_connector *connector,
|
|
struct i2c_adapter *adapter)
|
|
{
|
|
struct edid *edid;
|
|
int ret;
|
|
|
|
edid = drm_get_edid(connector, adapter);
|
|
if (!edid)
|
|
return 0;
|
|
|
|
ret = intel_connector_update_modes(connector, edid);
|
|
kfree(edid);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static const struct drm_prop_enum_list force_audio_names[] = {
|
|
{ HDMI_AUDIO_OFF_DVI, "force-dvi" },
|
|
{ HDMI_AUDIO_OFF, "off" },
|
|
{ HDMI_AUDIO_AUTO, "auto" },
|
|
{ HDMI_AUDIO_ON, "on" },
|
|
};
|
|
|
|
void
|
|
intel_attach_force_audio_property(struct drm_connector *connector)
|
|
{
|
|
struct drm_device *dev = connector->dev;
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
|
struct drm_property *prop;
|
|
|
|
prop = dev_priv->force_audio_property;
|
|
if (prop == NULL) {
|
|
prop = drm_property_create_enum(dev, 0,
|
|
"audio",
|
|
force_audio_names,
|
|
ARRAY_SIZE(force_audio_names));
|
|
if (prop == NULL)
|
|
return;
|
|
|
|
dev_priv->force_audio_property = prop;
|
|
}
|
|
drm_object_attach_property(&connector->base, prop, 0);
|
|
}
|
|
|
|
static const struct drm_prop_enum_list broadcast_rgb_names[] = {
|
|
{ INTEL_BROADCAST_RGB_AUTO, "Automatic" },
|
|
{ INTEL_BROADCAST_RGB_FULL, "Full" },
|
|
{ INTEL_BROADCAST_RGB_LIMITED, "Limited 16:235" },
|
|
};
|
|
|
|
void
|
|
intel_attach_broadcast_rgb_property(struct drm_connector *connector)
|
|
{
|
|
struct drm_device *dev = connector->dev;
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
|
struct drm_property *prop;
|
|
|
|
prop = dev_priv->broadcast_rgb_property;
|
|
if (prop == NULL) {
|
|
prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM,
|
|
"Broadcast RGB",
|
|
broadcast_rgb_names,
|
|
ARRAY_SIZE(broadcast_rgb_names));
|
|
if (prop == NULL)
|
|
return;
|
|
|
|
dev_priv->broadcast_rgb_property = prop;
|
|
}
|
|
|
|
drm_object_attach_property(&connector->base, prop, 0);
|
|
}
|
|
|
|
void
|
|
intel_attach_aspect_ratio_property(struct drm_connector *connector)
|
|
{
|
|
if (!drm_mode_create_aspect_ratio_property(connector->dev))
|
|
drm_object_attach_property(&connector->base,
|
|
connector->dev->mode_config.aspect_ratio_property,
|
|
DRM_MODE_PICTURE_ASPECT_NONE);
|
|
}
|