Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(362)

Unified Diff: ui/ozone/platform/drm/gpu/drm_display.cc

Issue 1945353004: Revert of ash: reset color management when new screens are hotplugged (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_device.cc ('k') | ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/drm/gpu/drm_display.cc
diff --git a/ui/ozone/platform/drm/gpu/drm_display.cc b/ui/ozone/platform/drm/gpu/drm_display.cc
index 8f7bdc588c0171ce779c2beffd41df5aa7a56a41..6ff1033cffb24f68b19ce291e92fb64dafec1806 100644
--- a/ui/ozone/platform/drm/gpu/drm_display.cc
+++ b/ui/ozone/platform/drm/gpu/drm_display.cc
@@ -174,10 +174,17 @@
const std::vector<GammaRampRGBEntry>& degamma_lut,
const std::vector<GammaRampRGBEntry>& gamma_lut,
const std::vector<float>& correction_matrix) {
- if (!drm_->SetColorCorrection(crtc_, degamma_lut, gamma_lut,
- correction_matrix)) {
- LOG(ERROR) << "Failed to set color correction for display: crtc_id = "
- << crtc_;
+ if (degamma_lut.empty()) {
+ if (!drm_->SetGammaRamp(crtc_, gamma_lut)) {
+ LOG(ERROR) << "Failed to set gamma ramp for display: crtc_id = " << crtc_
+ << " size = " << gamma_lut.size();
+ }
+ } else {
+ if (!drm_->SetColorCorrection(crtc_, degamma_lut, gamma_lut,
+ correction_matrix)) {
+ LOG(ERROR) << "Failed to set color correction for display: crtc_id = "
+ << crtc_;
+ }
}
}
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_device.cc ('k') | ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698