diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-26 23:48:25 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-26 23:48:24 -0800 |
| commit | d7de4c496cdd0cb0c8bb8989706c245d4a70d854 (patch) | |
| tree | b9cf6d73106d3bd0bab73311d327ddd4c10f8cf1 | |
| parent | b76466d98123254b10871d3d90b16ed552a92c62 (diff) | |
| parent | 509fc461641971496b44afb3e93ec329130245ba (diff) | |
Merge "drm/msm: do not trigger HPD work in non-pluggable case"
| -rw-r--r-- | drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c b/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c index d96aeeecb0fd..347b78886b24 100644 --- a/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c +++ b/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c @@ -440,7 +440,8 @@ static void _sde_hdmi_connector_irq(struct sde_hdmi *sde_hdmi) hpd_int_ctrl |= HDMI_HPD_INT_CTRL_INT_CONNECT; hdmi_write(hdmi, REG_HDMI_HPD_INT_CTRL, hpd_int_ctrl); - queue_work(hdmi->workq, &sde_hdmi->hpd_work); + if (!sde_hdmi->non_pluggable) + queue_work(hdmi->workq, &sde_hdmi->hpd_work); } } |