Skip to content

Ignore_edid=1 updates #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
linux4kix merged 2 commits into from
Oct 5, 2015
Merged

Ignore_edid=1 updates #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
062de7d
Commit c9e799fd2ceb96135197ee2008c0bf56bce7a57b (Add command line
mk01 Sep 30, 2015
a84b5a8
Commit e828201b66fe638ac099b5401bec4f5a0c477806 intended to assign
mk01 Sep 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions drivers/video/mxc/mxc_hdmi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1767,11 +1767,6 @@ static int mxc_hdmi_read_edid(struct mxc_hdmi *hdmi)
if (ret < 0)
return HDMI_EDID_FAIL;

dev_info(&hdmi->pdev->dev, "%s reports %s mode\n", __func__, hdmi->edid_cfg.hdmi_cap?"HDMI":"DVI");
hdmi->hp_state = hdmi->edid_cfg.hdmi_cap?HDMI_HOTPLUG_CONNECTED_HDMI:HDMI_HOTPLUG_CONNECTED_DVI;
hdmi->plug_event = hdmi->edid_cfg.hdmi_cap?HDMI_IH_PHY_STAT0_HPD:HDMI_DVI_IH_STAT;
hdmi->plug_mask = hdmi->edid_cfg.hdmi_cap?HDMI_PHY_HPD:HDMI_DVI_STAT;

if (memcmp(edid_old, hdmi->edid, HDMI_EDID_LEN) == 0) {
dev_info(&hdmi->pdev->dev, "same edid\n");
return HDMI_EDID_SAME;
Expand Down Expand Up @@ -1967,7 +1962,7 @@ static void mxc_hdmi_default_edid_cfg(struct mxc_hdmi *hdmi)
static void mxc_hdmi_default_modelist(struct mxc_hdmi *hdmi)
{
u32 i;
const struct fb_videomode *mode;
struct fb_videomode mode;

dev_dbg(&hdmi->pdev->dev, "%s\n", __func__);

Expand All @@ -1981,9 +1976,12 @@ static void mxc_hdmi_default_modelist(struct mxc_hdmi *hdmi)

/*Add all no interlaced CEA mode to default modelist */
for (i = 0; i < ARRAY_SIZE(mxc_cea_mode); i++) {
mode = &mxc_cea_mode[i];
if (!(mode->vmode & FB_VMODE_INTERLACED) && (mode->xres != 0))
fb_add_videomode(mode, &hdmi->fbi->modelist);
mode = mxc_cea_mode[i];
if (!(mode.vmode & FB_VMODE_INTERLACED) && (mode.xres != 0)) {
if (ignore_edid)
mode.flag |= FB_MODE_IS_STANDARD;
fb_add_videomode(&mode, &hdmi->fbi->modelist);
}
}

fb_new_modelist(hdmi->fbi);
Expand Down Expand Up @@ -2104,6 +2102,11 @@ static void mxc_hdmi_cable_connected(struct mxc_hdmi *hdmi)
break;
}

dev_info(&hdmi->pdev->dev, "%s reports %s mode\n", __func__, hdmi->edid_cfg.hdmi_cap ? "HDMI" : "DVI");
hdmi->hp_state = hdmi->edid_cfg.hdmi_cap ? HDMI_HOTPLUG_CONNECTED_HDMI : HDMI_HOTPLUG_CONNECTED_DVI;
hdmi->plug_event = hdmi->edid_cfg.hdmi_cap ? HDMI_IH_PHY_STAT0_HPD : HDMI_DVI_IH_STAT;
hdmi->plug_mask = hdmi->edid_cfg.hdmi_cap ? HDMI_PHY_HPD : HDMI_DVI_STAT;

/* Save edid cfg for audio driver */
hdmi_set_edid_cfg(edid_status, &hdmi->edid_cfg);

Expand Down