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

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

Issue 1914343003: Reland: 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, 8 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
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 6ff1033cffb24f68b19ce291e92fb64dafec1806..f05fbdd80c0bf017d69e411fb2f7fe8bc4c14366 100644
--- a/ui/ozone/platform/drm/gpu/drm_display.cc
+++ b/ui/ozone/platform/drm/gpu/drm_display.cc
@@ -174,7 +174,8 @@ void DrmDisplay::SetColorCorrection(
const std::vector<GammaRampRGBEntry>& degamma_lut,
const std::vector<GammaRampRGBEntry>& gamma_lut,
const std::vector<float>& correction_matrix) {
- if (degamma_lut.empty()) {
+ // Use the legacy gamma ramp only if we are given a gamma_lut.
robert.bradford 2016/04/27 12:29:46 // Use the legacy gamma ramp if we are given only
+ if (correction_matrix.empty() && degamma_lut.empty() && !gamma_lut.empty()) {
if (!drm_->SetGammaRamp(crtc_, gamma_lut)) {
LOG(ERROR) << "Failed to set gamma ramp for display: crtc_id = " << crtc_
<< " size = " << gamma_lut.size();
« ui/ozone/platform/drm/gpu/drm_device.cc ('K') | « ui/ozone/platform/drm/gpu/drm_device.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698