Merge tag 'drm-intel-next-2021-01-04' of git://anongit.freedesktop.org/drm/drm-intel...

[platform/kernel/linux-starfive.git] / drivers / gpu / drm / i915 / display / intel_display.c

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 14e714f..f2c48e5 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -15792,7 +15792,6 @@ static int intel_crtc_late_register(struct drm_crtc *crtc)
 }
 
 #define INTEL_CRTC_FUNCS \
-       .gamma_set = drm_atomic_helper_legacy_gamma_set, \
        .set_config = drm_atomic_helper_set_config, \
        .destroy = intel_crtc_destroy, \
        .page_flip = drm_atomic_helper_page_flip, \
@@ -17274,7 +17273,7 @@ int intel_modeset_init(struct drm_i915_private *i915)
         */
        ret = intel_initial_commit(&i915->drm);
        if (ret)
-               return ret;
+               drm_dbg_kms(&i915->drm, "Initial modeset failed, %d\n", ret);
 
        intel_overlay_setup(i915);