diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-16 04:36:05 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-16 04:44:30 -0500 |
| commit | 9035a97a32836d0e456ddafaaf249a844e6e4b5e (patch) | |
| tree | 41ec3db083bdb46cd831f0d39db1fe294ae7d55f /drivers/video/sh_mobile_hdmi.c | |
| parent | fe16d949b45036d9f80e20e07bde1ddacc930b10 (diff) | |
| parent | 452858338aec31c1f4414bf07f31663690479869 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Grab the latest stabilisation bits from -fixes and some suspend and
resume fixes from linus.
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c
Diffstat (limited to 'drivers/video/sh_mobile_hdmi.c')
| -rw-r--r-- | drivers/video/sh_mobile_hdmi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c index 74d9f546a2e8..2b9e56a6bde4 100644 --- a/drivers/video/sh_mobile_hdmi.c +++ b/drivers/video/sh_mobile_hdmi.c | |||
| @@ -1151,7 +1151,7 @@ static void sh_hdmi_edid_work_fn(struct work_struct *work) | |||
| 1151 | 1151 | ||
| 1152 | ch = info->par; | 1152 | ch = info->par; |
| 1153 | 1153 | ||
| 1154 | acquire_console_sem(); | 1154 | console_lock(); |
| 1155 | 1155 | ||
| 1156 | /* HDMI plug in */ | 1156 | /* HDMI plug in */ |
| 1157 | if (!sh_hdmi_must_reconfigure(hdmi) && | 1157 | if (!sh_hdmi_must_reconfigure(hdmi) && |
| @@ -1171,7 +1171,7 @@ static void sh_hdmi_edid_work_fn(struct work_struct *work) | |||
| 1171 | fb_set_suspend(info, 0); | 1171 | fb_set_suspend(info, 0); |
| 1172 | } | 1172 | } |
| 1173 | 1173 | ||
| 1174 | release_console_sem(); | 1174 | console_unlock(); |
| 1175 | } else { | 1175 | } else { |
| 1176 | ret = 0; | 1176 | ret = 0; |
| 1177 | if (!hdmi->info) | 1177 | if (!hdmi->info) |
| @@ -1181,12 +1181,12 @@ static void sh_hdmi_edid_work_fn(struct work_struct *work) | |||
| 1181 | fb_destroy_modedb(hdmi->monspec.modedb); | 1181 | fb_destroy_modedb(hdmi->monspec.modedb); |
| 1182 | hdmi->monspec.modedb = NULL; | 1182 | hdmi->monspec.modedb = NULL; |
| 1183 | 1183 | ||
| 1184 | acquire_console_sem(); | 1184 | console_lock(); |
| 1185 | 1185 | ||
| 1186 | /* HDMI disconnect */ | 1186 | /* HDMI disconnect */ |
| 1187 | fb_set_suspend(hdmi->info, 1); | 1187 | fb_set_suspend(hdmi->info, 1); |
| 1188 | 1188 | ||
| 1189 | release_console_sem(); | 1189 | console_unlock(); |
| 1190 | pm_runtime_put(hdmi->dev); | 1190 | pm_runtime_put(hdmi->dev); |
| 1191 | } | 1191 | } |
| 1192 | 1192 | ||