diff options
| author | Octavian Purdila <octavian.purdila@intel.com> | 2011-07-15 17:34:15 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-15 19:05:07 +0200 |
| commit | 6e4b308a286821458633a90b82d63d2ce7e742b5 (patch) | |
| tree | efa45c3a47cdb26b42010b0038b5a89ee1082061 /drivers/staging | |
| parent | 173b3de9a5817ec2c264eca1b8795c7dbda3c50e (diff) | |
gma500: skip getting modes via DDC on Moorestown
Moorestown does not have a DDC bus, skip getting modes via DDC. This
fixes the following bug:
BUG: unable to handle kernel NULL pointer dereference at 00000010
IP: [<c1172ff7>] i2c_transfer+0x17/0xb0
*pde = 00000000
Oops: 0000 [#1]
Call Trace:
[<c1153ae9>] drm_do_probe_ddc_edid+0x59/0x90
[<c1153cb4>] drm_get_edid+0x24/0x250
[<c11805d2>] psb_intel_ddc_get_modes+0x22/0x60
[<c117fe11>] psb_intel_lvds_get_modes+0x21/0x80
Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/gma500/psb_intel_lvds.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/gma500/psb_intel_lvds.c b/drivers/staging/gma500/psb_intel_lvds.c index da6f5c89e5e..53803b25cad 100644 --- a/drivers/staging/gma500/psb_intel_lvds.c +++ b/drivers/staging/gma500/psb_intel_lvds.c @@ -521,7 +521,8 @@ static int psb_intel_lvds_get_modes(struct drm_connector *connector) psb_intel_output->mode_dev; int ret = 0; - ret = psb_intel_ddc_get_modes(psb_intel_output); + if (!IS_MRST(dev)) + ret = psb_intel_ddc_get_modes(psb_intel_output); if (ret) return ret; |