diff options
author | Dave Airlie | 2017-04-04 02:13:40 +0200 |
---|---|---|
committer | Dave Airlie | 2017-04-04 02:13:40 +0200 |
commit | 130e35e4bbceb2c04ff0ad9b1a0bcef7acc11498 (patch) | |
tree | 81767eb72aae54b1ec11f3dc5a98a2c7c36394b5 /drivers/gpu/drm/msm/dsi/dsi_manager.c | |
parent | Merge branch 'vmwgfx-fixes-4.11' of git://people.freedesktop.org/~thomash/lin... (diff) | |
parent | drm/msm: Make sure to detach the MMU during GPU cleanup (diff) | |
download | kernel-qcow2-linux-130e35e4bbceb2c04ff0ad9b1a0bcef7acc11498.tar.gz kernel-qcow2-linux-130e35e4bbceb2c04ff0ad9b1a0bcef7acc11498.tar.xz kernel-qcow2-linux-130e35e4bbceb2c04ff0ad9b1a0bcef7acc11498.zip |
Merge branch 'msm-fixes-4.11-rc6' of git://people.freedesktop.org/~robclark/linux into drm-fixes
misc msm fixes.
* 'msm-fixes-4.11-rc6' of git://people.freedesktop.org/~robclark/linux:
drm/msm: Make sure to detach the MMU during GPU cleanup
drm/msm/hdmi: redefinitions of macros not required
drm/msm/mdp5: Update SSPP_MAX value
drm/msm/dsi: Fix bug in dsi_mgr_phy_enable
drm/msm: Don't allow zero sized buffer objects
drm/msm: Fix wrong pointer check in a5xx_destroy
drm/msm: adreno: fix build error without debugfs
Diffstat (limited to 'drivers/gpu/drm/msm/dsi/dsi_manager.c')
-rw-r--r-- | drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c index 921270ea6059..a879ffa534b4 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c @@ -171,7 +171,7 @@ dsi_mgr_phy_enable(int id, } } } else { - msm_dsi_host_reset_phy(mdsi->host); + msm_dsi_host_reset_phy(msm_dsi->host); ret = enable_phy(msm_dsi, src_pll_id, &shared_timings[id]); if (ret) return ret; |