diff options
author | Mykhailo Sopiha | 2018-11-29 09:28:01 -0600 |
---|---|---|
committer | Praneeth Bajjuri | 2018-11-29 09:30:33 -0600 |
commit | bb49cf651c05cb43968feff60ca62f747c51a88e (patch) | |
tree | 004617458378efcbf9cef085e11733820b4d60c2 /hwcomposer/display.cc | |
parent | 5c7c1e6912bf8d87769f1627afac7250628a4ce0 (diff) | |
download | hardware-ti-dra7xx-bb49cf651c05cb43968feff60ca62f747c51a88e.tar.gz hardware-ti-dra7xx-bb49cf651c05cb43968feff60ca62f747c51a88e.tar.xz hardware-ti-dra7xx-bb49cf651c05cb43968feff60ca62f747c51a88e.zip |
Revert "hwcomposer: avoid kernel panic after stop-start"d-oreo-mr1-core-release
This reverts commit 5c7c1e6912bf8d87769f1627afac7250628a4ce0.
Kernel panic is fixed from kernel side in pvrsrvkm.ko,
and the patch is not needed any more
Signed-off-by: Mykhailo Sopiha <mykhailo.sopiha@linaro.org>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Diffstat (limited to 'hwcomposer/display.cc')
-rw-r--r-- | hwcomposer/display.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hwcomposer/display.cc b/hwcomposer/display.cc index 76d8052..0a3ddae 100644 --- a/hwcomposer/display.cc +++ b/hwcomposer/display.cc | |||
@@ -164,14 +164,15 @@ static void set_plane_properties(kms::AtomicReq &req, drm_plane_props_t *plane_p | |||
164 | uint32_t fb_id = plane_props->fb_info->fb_id; | 164 | uint32_t fb_id = plane_props->fb_info->fb_id; |
165 | kms::Plane* plane = plane_props->plane; | 165 | kms::Plane* plane = plane_props->plane; |
166 | 166 | ||
167 | req.add(plane, "FB_ID", fb_id); | ||
168 | |||
167 | if (!fb_id) { | 169 | if (!fb_id) { |
168 | /* disable plane */ | 170 | /* disable plane */ |
169 | ALOGI("Disabling plane %d", plane->id()); | 171 | ALOGI("Disabling plane %d", plane->id()); |
172 | req.add(plane, "ACTIVE", 0); | ||
170 | return; | 173 | return; |
171 | } | 174 | } |
172 | 175 | ||
173 | req.add(plane, "FB_ID", fb_id); | ||
174 | |||
175 | req.add(plane, "IN_FENCE_FD", plane_props->fb_info->acquirefence); | 176 | req.add(plane, "IN_FENCE_FD", plane_props->fb_info->acquirefence); |
176 | 177 | ||
177 | req.add(plane, { | 178 | req.add(plane, { |