From 9583c099b4a08b49e03f7b461c344b6d277fd262 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Wed, 10 Dec 2008 15:47:28 -0800 Subject: Revert "Merge branch 'modesetting-gem'" This reverts commit 6656db10551bbb8770dd945b6d81d5138521f208. We really just want the libdrm and ioctl bits, not all the driver stuff. --- linux-core/intel_modes.c | 61 ------------------------------------------------ 1 file changed, 61 deletions(-) delete mode 100644 linux-core/intel_modes.c (limited to 'linux-core/intel_modes.c') diff --git a/linux-core/intel_modes.c b/linux-core/intel_modes.c deleted file mode 100644 index 79be3575..00000000 --- a/linux-core/intel_modes.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2007 Dave Airlie - * Copyright (c) 2007 Intel Corporation - * Jesse Barnes - */ - -#include -#include -#include "drmP.h" -#include "intel_drv.h" - -/** - * intel_ddc_probe - * - */ -bool intel_ddc_probe(struct intel_output *intel_output) -{ - u8 out_buf[] = { 0x0, 0x0}; - u8 buf[2]; - int ret; - struct i2c_msg msgs[] = { - { - .addr = 0x50, - .flags = 0, - .len = 1, - .buf = out_buf, - }, - { - .addr = 0x50, - .flags = I2C_M_RD, - .len = 1, - .buf = buf, - } - }; - - ret = i2c_transfer(&intel_output->ddc_bus->adapter, msgs, 2); - if (ret == 2) - return true; - - return false; -} - -/** - * intel_ddc_get_modes - get modelist from monitor - * @connector: DRM connector device to use - * - * Fetch the EDID information from @connector using the DDC bus. - */ -int intel_ddc_get_modes(struct intel_output *intel_output) -{ - struct edid *edid; - int ret = 0; - - edid = drm_get_edid(&intel_output->base, &intel_output->ddc_bus->adapter); - if (edid) { - drm_mode_connector_update_edid_property(&intel_output->base, edid); - ret = drm_add_edid_modes(&intel_output->base, edid); - kfree(edid); - } - return ret; -} -- cgit v1.2.3