diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-26 15:47:03 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-26 15:47:03 -0400 |
| commit | 1e1b37273cf719545da50b76f214f983a710aaf4 (patch) | |
| tree | 033f6062325ef7aaeefe8559bb409ab7d2be3c76 /drivers/gpu/drm/drm_atomic.c | |
| parent | c183a603e8d8a5a189729b77d0c623a3d5950e5f (diff) | |
| parent | c291b015158577be533dd5a959dfc09bab119eed (diff) | |
Merge branch 'x86/urgent' into x86/apic
Bring in the upstream modifications so we can fixup the silent merge
conflict which is introduced by this merge.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/gpu/drm/drm_atomic.c')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index fa3930757972..2a3ded44cf2a 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c | |||
| @@ -475,7 +475,7 @@ int drm_atomic_crtc_set_property(struct drm_crtc *crtc, | |||
| 475 | val, | 475 | val, |
| 476 | -1, | 476 | -1, |
| 477 | &replaced); | 477 | &replaced); |
| 478 | state->color_mgmt_changed = replaced; | 478 | state->color_mgmt_changed |= replaced; |
| 479 | return ret; | 479 | return ret; |
| 480 | } else if (property == config->ctm_property) { | 480 | } else if (property == config->ctm_property) { |
| 481 | ret = drm_atomic_replace_property_blob_from_id(crtc, | 481 | ret = drm_atomic_replace_property_blob_from_id(crtc, |
| @@ -483,7 +483,7 @@ int drm_atomic_crtc_set_property(struct drm_crtc *crtc, | |||
| 483 | val, | 483 | val, |
| 484 | sizeof(struct drm_color_ctm), | 484 | sizeof(struct drm_color_ctm), |
| 485 | &replaced); | 485 | &replaced); |
| 486 | state->color_mgmt_changed = replaced; | 486 | state->color_mgmt_changed |= replaced; |
| 487 | return ret; | 487 | return ret; |
| 488 | } else if (property == config->gamma_lut_property) { | 488 | } else if (property == config->gamma_lut_property) { |
| 489 | ret = drm_atomic_replace_property_blob_from_id(crtc, | 489 | ret = drm_atomic_replace_property_blob_from_id(crtc, |
| @@ -491,7 +491,7 @@ int drm_atomic_crtc_set_property(struct drm_crtc *crtc, | |||
| 491 | val, | 491 | val, |
| 492 | -1, | 492 | -1, |
| 493 | &replaced); | 493 | &replaced); |
| 494 | state->color_mgmt_changed = replaced; | 494 | state->color_mgmt_changed |= replaced; |
| 495 | return ret; | 495 | return ret; |
| 496 | } else if (crtc->funcs->atomic_set_property) | 496 | } else if (crtc->funcs->atomic_set_property) |
| 497 | return crtc->funcs->atomic_set_property(crtc, state, property, val); | 497 | return crtc->funcs->atomic_set_property(crtc, state, property, val); |