diff options
author | Mykhailo Sopiha | 2018-11-13 15:34:49 -0600 |
---|---|---|
committer | Praneeth Bajjuri | 2018-11-13 09:43:04 -0600 |
commit | 5c7c1e6912bf8d87769f1627afac7250628a4ce0 (patch) | |
tree | b281e413045950cdcf6cae1b67a1ec128a6899b1 | |
parent | 172204d35de542f8f8161502f350d893472dc6cb (diff) | |
download | hardware-ti-dra7xx-5c7c1e6912bf8d87769f1627afac7250628a4ce0.tar.gz hardware-ti-dra7xx-5c7c1e6912bf8d87769f1627afac7250628a4ce0.tar.xz hardware-ti-dra7xx-5c7c1e6912bf8d87769f1627afac7250628a4ce0.zip |
hwcomposer: avoid kernel panic after stop-start
This patch allows bypass kernel panic on HDMI hotpug
and stop-start command sequence
Signed-off-by: Mykhailo Sopiha <mykhailo.sopiha@linaro.org>
-rw-r--r-- | hwcomposer/display.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hwcomposer/display.cc b/hwcomposer/display.cc index 0a3ddae..76d8052 100644 --- a/hwcomposer/display.cc +++ b/hwcomposer/display.cc | |||
@@ -164,15 +164,14 @@ 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 | |||
169 | if (!fb_id) { | 167 | if (!fb_id) { |
170 | /* disable plane */ | 168 | /* disable plane */ |
171 | ALOGI("Disabling plane %d", plane->id()); | 169 | ALOGI("Disabling plane %d", plane->id()); |
172 | req.add(plane, "ACTIVE", 0); | ||
173 | return; | 170 | return; |
174 | } | 171 | } |
175 | 172 | ||
173 | req.add(plane, "FB_ID", fb_id); | ||
174 | |||
176 | req.add(plane, "IN_FENCE_FD", plane_props->fb_info->acquirefence); | 175 | req.add(plane, "IN_FENCE_FD", plane_props->fb_info->acquirefence); |
177 | 176 | ||
178 | req.add(plane, { | 177 | req.add(plane, { |