1. 05 Jul, 2018 1 commit
  2. 04 Jul, 2018 3 commits
  3. 03 Jul, 2018 11 commits
  4. 02 Jul, 2018 13 commits
  5. 01 Jul, 2018 1 commit
  6. 29 Jun, 2018 9 commits
  7. 28 Jun, 2018 2 commits
    • Gustavo Padovan's avatar
      Merge tag 'ib-fbdev-drm-v4.19-deferred-console-takeover' of... · c981c011
      Gustavo Padovan authored
      Merge tag 'ib-fbdev-drm-v4.19-deferred-console-takeover' of https://github.com/bzolnier/linux into drm-misc-next
      
      Immutable branch between fbdev and drm for the v4.19 merge window
      (contains the deferred console takeover feature)
      Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.com>
      
      # gpg: Signature made Thu 28 Jun 2018 10:24:50 AM -03
      # gpg:                using RSA key 7E33B63FA047C20B
      # gpg: Can't check signature: public key not found
      
      # Conflicts:
      #	drivers/gpu/drm/i915/i915_gem.c
      #	drivers/gpu/drm/i915/intel_crt.c
      #	drivers/gpu/drm/i915/intel_display.c
      #	drivers/gpu/drm/i915/intel_lrc.c
      Link: https://patchwork.freedesktop.org/patch/msgid/2462549.rLSfW9kX99@amdc3058
      c981c011
    • Hans de Goede's avatar
      console/fbcon: Add support for deferred console takeover · 83d83beb
      Hans de Goede authored
      Currently fbcon claims fbdevs as soon as they are registered and takes over
      the console as soon as the first fbdev gets registered.
      
      This behavior is undesirable in cases where a smooth graphical bootup is
      desired, in such cases we typically want the contents of the framebuffer
      (typically a vendor logo) to stay in place as is.
      
      The current solution for this problem (on embedded systems) is to not
      enable fbcon.
      
      This commit adds a new FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER config option,
      which when enabled defers fbcon taking over the console from the dummy
      console until the first text is displayed on the console. Together with the
      "quiet" kernel commandline option, this allows fbcon to still be used
      together with a smooth graphical bootup, having it take over the console as
      soon as e.g. an error message is logged.
      
      Note the choice to detect the first console output in the dummycon driver,
      rather then handling this entirely inside the fbcon code, was made after
      2 failed attempts to handle this entirely inside the fbcon code. The fbcon
      code is woven quite tightly into the console code, making this to only
      feasible option.
      Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
      83d83beb