diff options
| author | Andy Green <andy.green@linaro.org> | 2011-06-26 11:09:11 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-06-26 11:09:11 +0100 |
| commit | 83a0790d670cfa9912ae3149dc9d17d57c1bb717 (patch) | |
| tree | 3f2fcded5352836560f45e94ae0ef1c4a7d8c012 /drivers | |
| parent | 20b7045046128e5f4e3136008fd1bcac5f732899 (diff) | |
fix lfb edid uplevel use original 512 MAX EDID LENGTH
Zach's uplevel of the non-DRM EDID parser redefines the max EDID length
down from 512 to 256.
This keeps the longer default length since presumably some monitors out there
may actually use it.
Signed-off-by: Andy Green <andy.green@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/omap2/dss/hdmi.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/hdmi.h b/drivers/video/omap2/dss/hdmi.h index 6c79a57500b..913aef1b131 100644 --- a/drivers/video/omap2/dss/hdmi.h +++ b/drivers/video/omap2/dss/hdmi.h @@ -194,7 +194,11 @@ struct hdmi_reg { u16 idx; }; #define HDMI_TXPHY_PAD_CFG_CTRL HDMI_PHY_REG(0xC) /* HDMI EDID Length */ -#define HDMI_EDID_MAX_LENGTH 256 + +/* inherit the length from plat/edid.h, which is 512 + * + * #define HDMI_EDID_MAX_LENGTH 256 + */ #define EDID_TIMING_DESCRIPTOR_SIZE 0x12 #define EDID_DESCRIPTOR_BLOCK0_ADDRESS 0x36 #define EDID_DESCRIPTOR_BLOCK1_ADDRESS 0x80 |