forked from Minki/linux
612a9aab56
Pull drm merge (part 1) from Dave Airlie: "So first of all my tree and uapi stuff has a conflict mess, its my fault as the nouveau stuff didn't hit -next as were trying to rebase regressions out of it before we merged. Highlights: - SH mobile modesetting driver and associated helpers - some DRM core documentation - i915 modesetting rework, haswell hdmi, haswell and vlv fixes, write combined pte writing, ilk rc6 support, - nouveau: major driver rework into a hw core driver, makes features like SLI a lot saner to implement, - psb: add eDP/DP support for Cedarview - radeon: 2 layer page tables, async VM pte updates, better PLL selection for > 2 screens, better ACPI interactions The rest is general grab bag of fixes. So why part 1? well I have the exynos pull req which came in a bit late but was waiting for me to do something they shouldn't have and it looks fairly safe, and David Howells has some more header cleanups he'd like me to pull, that seem like a good idea, but I'd like to get this merge out of the way so -next dosen't get blocked." Tons of conflicts mostly due to silly include line changes, but mostly mindless. A few other small semantic conflicts too, noted from Dave's pre-merged branch. * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (447 commits) drm/nv98/crypt: fix fuc build with latest envyas drm/nouveau/devinit: fixup various issues with subdev ctor/init ordering drm/nv41/vm: fix and enable use of "real" pciegart drm/nv44/vm: fix and enable use of "real" pciegart drm/nv04/dmaobj: fixup vm target handling in preparation for nv4x pcie drm/nouveau: store supported dma mask in vmmgr drm/nvc0/ibus: initial implementation of subdev drm/nouveau/therm: add support for fan-control modes drm/nouveau/hwmon: rename pwm0* to pmw1* to follow hwmon's rules drm/nouveau/therm: calculate the pwm divisor on nv50+ drm/nouveau/fan: rewrite the fan tachometer driver to get more precision, faster drm/nouveau/therm: move thermal-related functions to the therm subdev drm/nouveau/bios: parse the pwm divisor from the perf table drm/nouveau/therm: use the EXTDEV table to detect i2c monitoring devices drm/nouveau/therm: rework thermal table parsing drm/nouveau/gpio: expose the PWM/TOGGLE parameter found in the gpio vbios table drm/nouveau: fix pm initialization order drm/nouveau/bios: check that fixed tvdac gpio data is valid before using it drm/nouveau: log channel debug/error messages from client object rather than drm client drm/nouveau: have drm debugging macros build on top of core macros ...
126 lines
3.6 KiB
C
126 lines
3.6 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 <linux/fb.h>
|
|
#include <drm/drm_edid.h>
|
|
#include <drm/drmP.h>
|
|
#include <drm/drm_edid.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);
|
|
drm_edid_to_eld(connector, edid);
|
|
kfree(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;
|
|
|
|
edid = drm_get_edid(connector, adapter);
|
|
if (!edid)
|
|
return 0;
|
|
|
|
return intel_connector_update_modes(connector, edid);
|
|
}
|
|
|
|
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 = dev->dev_private;
|
|
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_connector_attach_property(connector, prop, 0);
|
|
}
|
|
|
|
static const struct drm_prop_enum_list broadcast_rgb_names[] = {
|
|
{ 0, "Full" },
|
|
{ 1, "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 = dev->dev_private;
|
|
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_connector_attach_property(connector, prop, 0);
|
|
}
|