Merge drm/drm-next into drm-intel-next-queued

[linux-2.6-block.git] / drivers / gpu / drm / drm_atomic.c

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 3dbfbddae7e6f2f887b30773e9b06a98774d640c..1706ed1100d5cd9bdf4aaa8a735eaf45bc76f353 100644 (file)
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -395,6 +395,11 @@ static int drm_atomic_connector_check(struct drm_connector *connector,
 {
        struct drm_crtc_state *crtc_state;
        struct drm_writeback_job *writeback_job = state->writeback_job;
+       const struct drm_display_info *info = &connector->display_info;
+
+       state->max_bpc = info->bpc ? info->bpc : 8;
+       if (connector->max_bpc_property)
+               state->max_bpc = min(state->max_bpc, state->max_requested_bpc);
 
        if ((connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK) || !writeback_job)
                return 0;