Skip to content

mxc-hdmi: don't unmask interrupts at start of cable_connected() session #12

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 1 commit into from
Sep 2, 2015
Merged

mxc-hdmi: don't unmask interrupts at start of cable_connected() session #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions drivers/video/mxc/mxc_hdmi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2035,6 +2035,10 @@ static void mxc_hdmi_set_mode(struct mxc_hdmi *hdmi)
return;
}

console_lock();
fb_blank(hdmi->fbi, FB_BLANK_UNBLANK);
console_unlock();

/* If video mode same as previous, init HDMI again */
if (fb_mode_is_equal(&hdmi->previous_non_vga_mode, mode)) {
dev_dbg(&hdmi->pdev->dev,
Expand All @@ -2061,10 +2065,6 @@ static void mxc_hdmi_cable_connected(struct mxc_hdmi *hdmi)

hdmi->hp_state = HDMI_HOTPLUG_CONNECTED_NO_EDID;

console_lock();
fb_blank(hdmi->fbi, FB_BLANK_UNBLANK);
console_unlock();

/* HDMI Initialization Step C */
if (ignore_edid) {
edid_status = HDMI_EDID_FAIL;
Expand Down Expand Up @@ -2504,8 +2504,9 @@ static int mxc_hdmi_fb_event(struct notifier_block *nb,
/* Unmute interrupts */
hdmi_writeb(~hdmi->plug_event, HDMI_IH_MUTE_PHY_STAT0);

mxc_hdmi_setup(hdmi, val);
hdmi_set_blank_state(1);
if (check_hdmi_state())
mxc_hdmi_setup(hdmi, val);
} else if (*((int *)event->data) != hdmi->blank) {
dev_dbg(&hdmi->pdev->dev,
"event=FB_EVENT_BLANK - BLANK\n");
Expand Down