]> bbs.cooldavid.org Git - net-next-2.6.git/blame - drivers/gpu/drm/i915/intel_modes.c
Merge branch 'flock' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
[net-next-2.6.git] / drivers / gpu / drm / i915 / intel_modes.c
CommitLineData
79e53945
JB
1/*
2 * Copyright (c) 2007 Dave Airlie <airlied@linux.ie>
f899fc64 3 * Copyright (c) 2007, 2010 Intel Corporation
79e53945
JB
4 * Jesse Barnes <jesse.barnes@intel.com>
5 *
6 * Permission is hereby granted, free of charge, to any person obtaining a
7 * copy of this software and associated documentation files (the "Software"),
8 * to deal in the Software without restriction, including without limitation
9 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
10 * and/or sell copies of the Software, and to permit persons to whom the
11 * Software is furnished to do so, subject to the following conditions:
12 *
13 * The above copyright notice and this permission notice (including the next
14 * paragraph) shall be included in all copies or substantial portions of the
15 * Software.
16 *
17 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
20 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
22 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23 * DEALINGS IN THE SOFTWARE.
24 */
25
5a0e3ad6 26#include <linux/slab.h>
79e53945
JB
27#include <linux/i2c.h>
28#include <linux/fb.h>
29#include "drmP.h"
30#include "intel_drv.h"
0ba0e9e1 31#include "i915_drv.h"
79e53945
JB
32
33/**
34 * intel_ddc_probe
35 *
36 */
f899fc64 37bool intel_ddc_probe(struct intel_encoder *intel_encoder, int ddc_bus)
79e53945 38{
f899fc64 39 struct drm_i915_private *dev_priv = intel_encoder->base.dev->dev_private;
79e53945
JB
40 u8 out_buf[] = { 0x0, 0x0};
41 u8 buf[2];
79e53945
JB
42 struct i2c_msg msgs[] = {
43 {
44 .addr = 0x50,
45 .flags = 0,
46 .len = 1,
47 .buf = out_buf,
48 },
49 {
50 .addr = 0x50,
51 .flags = I2C_M_RD,
52 .len = 1,
53 .buf = buf,
54 }
55 };
56
f899fc64 57 return i2c_transfer(&dev_priv->gmbus[ddc_bus].adapter, msgs, 2) == 2;
79e53945
JB
58}
59
60/**
61 * intel_ddc_get_modes - get modelist from monitor
62 * @connector: DRM connector device to use
335af9a2 63 * @adapter: i2c adapter
79e53945
JB
64 *
65 * Fetch the EDID information from @connector using the DDC bus.
66 */
335af9a2
ZW
67int intel_ddc_get_modes(struct drm_connector *connector,
68 struct i2c_adapter *adapter)
79e53945
JB
69{
70 struct edid *edid;
71 int ret = 0;
72
335af9a2 73 edid = drm_get_edid(connector, adapter);
79e53945 74 if (edid) {
335af9a2
ZW
75 drm_mode_connector_update_edid_property(connector, edid);
76 ret = drm_add_edid_modes(connector, edid);
77 connector->display_info.raw_edid = NULL;
79e53945
JB
78 kfree(edid);
79 }
80
81 return ret;
82}