diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-10-27 12:48:37 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-10-27 12:48:37 -0700 |
| commit | edcc07ba51ef5ee4555bbcdf4b1d523836c74820 (patch) | |
| tree | 9c3ad1b34de2a182b3f9eb0c00c61eae6b830a0e /drivers/gpu | |
| parent | e4a7383ace344c9851408bd4105a78cd2c9fc616 (diff) | |
| parent | ce46ccdb6ddddc9e0bcbdc6953db3dae9c901d84 (diff) | |
Merge "drm/msm/sde: ignore scaler v2 data if not enabled"
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/msm/sde/sde_plane.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/sde/sde_plane.c b/drivers/gpu/drm/msm/sde/sde_plane.c index ff5307160f79..e50577e3eb4b 100644 --- a/drivers/gpu/drm/msm/sde/sde_plane.c +++ b/drivers/gpu/drm/msm/sde/sde_plane.c @@ -2143,6 +2143,12 @@ static inline void _sde_plane_set_scaler_v2(struct sde_phy_plane *pp, return; } + /* detach/ignore user data if 'disabled' */ + if (!scale_v2.enable) { + SDE_DEBUG_PLANE(psde, "scale data removed\n"); + return; + } + /* populate from user space */ pe = &(pp->pixel_ext); memset(pe, 0, sizeof(struct sde_hw_pixel_ext)); |