Merge tag 'drm-misc-next-2019-04-18' of git://anongit.freedesktop.org/drm/drm-misc...
[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / intel_fbdev.c
index e8f694b57b8ac857528824051ddcc42016e86239..89db719961489d03b6496be84a1b3a46c3369fdc 100644 (file)
  */
 
 #include <linux/async.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
 #include <linux/console.h>
+#include <linux/delay.h>
 #include <linux/errno.h>
-#include <linux/string.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
+#include <linux/module.h>
+#include <linux/string.h>
 #include <linux/sysrq.h>
-#include <linux/delay.h>
-#include <linux/init.h>
+#include <linux/tty.h>
 #include <linux/vga_switcheroo.h>
 
 #include <drm/drm_crtc.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_fourcc.h>
+#include <drm/i915_drm.h>
 
+#include "i915_drv.h"
 #include "intel_drv.h"
+#include "intel_fbdev.h"
 #include "intel_frontbuffer.h"
-#include <drm/i915_drm.h>
-#include "i915_drv.h"
 
 static void intel_fbdev_invalidate(struct intel_fbdev *ifbdev)
 {
@@ -235,12 +236,8 @@ static int intelfb_create(struct drm_fb_helper *helper,
                goto out_unpin;
        }
 
-       info->par = helper;
-
        ifbdev->helper.fb = fb;
 
-       strcpy(info->fix.id, "inteldrmfb");
-
        info->fbops = &intelfb_ops;
 
        /* setup aperture base/size for vesafb takeover */
@@ -259,11 +256,7 @@ static int intelfb_create(struct drm_fb_helper *helper,
        info->screen_base = vaddr;
        info->screen_size = vma->node.size;
 
-       /* This driver doesn't need a VT switch to restore the mode on resume */
-       info->skip_vt_switch = true;
-
-       drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
-       drm_fb_helper_fill_var(info, &ifbdev->helper, sizes->fb_width, sizes->fb_height);
+       drm_fb_helper_fill_info(info, &ifbdev->helper, sizes);
 
        /* If the object is shmemfs backed, it will have given us zeroed pages.
         * If the object is stolen however, it will be full of whatever
@@ -292,225 +285,7 @@ out_unlock:
        return ret;
 }
 
-static struct drm_fb_helper_crtc *
-intel_fb_helper_crtc(struct drm_fb_helper *fb_helper, struct drm_crtc *crtc)
-{
-       int i;
-
-       for (i = 0; i < fb_helper->crtc_count; i++)
-               if (fb_helper->crtc_info[i].mode_set.crtc == crtc)
-                       return &fb_helper->crtc_info[i];
-
-       return NULL;
-}
-
-/*
- * Try to read the BIOS display configuration and use it for the initial
- * fb configuration.
- *
- * The BIOS or boot loader will generally create an initial display
- * configuration for us that includes some set of active pipes and displays.
- * This routine tries to figure out which pipes and connectors are active
- * and stuffs them into the crtcs and modes array given to us by the
- * drm_fb_helper code.
- *
- * The overall sequence is:
- *   intel_fbdev_init - from driver load
- *     intel_fbdev_init_bios - initialize the intel_fbdev using BIOS data
- *     drm_fb_helper_init - build fb helper structs
- *     drm_fb_helper_single_add_all_connectors - more fb helper structs
- *   intel_fbdev_initial_config - apply the config
- *     drm_fb_helper_initial_config - call ->probe then register_framebuffer()
- *         drm_setup_crtcs - build crtc config for fbdev
- *           intel_fb_initial_config - find active connectors etc
- *         drm_fb_helper_single_fb_probe - set up fbdev
- *           intelfb_create - re-use or alloc fb, build out fbdev structs
- *
- * Note that we don't make special consideration whether we could actually
- * switch to the selected modes without a full modeset. E.g. when the display
- * is in VGA mode we need to recalculate watermarks and set a new high-res
- * framebuffer anyway.
- */
-static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
-                                   struct drm_fb_helper_crtc **crtcs,
-                                   struct drm_display_mode **modes,
-                                   struct drm_fb_offset *offsets,
-                                   bool *enabled, int width, int height)
-{
-       struct drm_i915_private *dev_priv = to_i915(fb_helper->dev);
-       unsigned int count = min(fb_helper->connector_count, BITS_PER_LONG);
-       unsigned long conn_configured, conn_seq;
-       int i, j;
-       bool *save_enabled;
-       bool fallback = true, ret = true;
-       int num_connectors_enabled = 0;
-       int num_connectors_detected = 0;
-       struct drm_modeset_acquire_ctx ctx;
-
-       save_enabled = kcalloc(count, sizeof(bool), GFP_KERNEL);
-       if (!save_enabled)
-               return false;
-
-       drm_modeset_acquire_init(&ctx, 0);
-
-       while (drm_modeset_lock_all_ctx(fb_helper->dev, &ctx) != 0)
-               drm_modeset_backoff(&ctx);
-
-       memcpy(save_enabled, enabled, count);
-       conn_seq = GENMASK(count - 1, 0);
-       conn_configured = 0;
-retry:
-       for (i = 0; i < count; i++) {
-               struct drm_fb_helper_connector *fb_conn;
-               struct drm_connector *connector;
-               struct drm_encoder *encoder;
-               struct drm_fb_helper_crtc *new_crtc;
-
-               fb_conn = fb_helper->connector_info[i];
-               connector = fb_conn->connector;
-
-               if (conn_configured & BIT(i))
-                       continue;
-
-               /* First pass, only consider tiled connectors */
-               if (conn_seq == GENMASK(count - 1, 0) && !connector->has_tile)
-                       continue;
-
-               if (connector->status == connector_status_connected)
-                       num_connectors_detected++;
-
-               if (!enabled[i]) {
-                       DRM_DEBUG_KMS("connector %s not enabled, skipping\n",
-                                     connector->name);
-                       conn_configured |= BIT(i);
-                       continue;
-               }
-
-               if (connector->force == DRM_FORCE_OFF) {
-                       DRM_DEBUG_KMS("connector %s is disabled by user, skipping\n",
-                                     connector->name);
-                       enabled[i] = false;
-                       continue;
-               }
-
-               encoder = connector->state->best_encoder;
-               if (!encoder || WARN_ON(!connector->state->crtc)) {
-                       if (connector->force > DRM_FORCE_OFF)
-                               goto bail;
-
-                       DRM_DEBUG_KMS("connector %s has no encoder or crtc, skipping\n",
-                                     connector->name);
-                       enabled[i] = false;
-                       conn_configured |= BIT(i);
-                       continue;
-               }
-
-               num_connectors_enabled++;
-
-               new_crtc = intel_fb_helper_crtc(fb_helper,
-                                               connector->state->crtc);
-
-               /*
-                * Make sure we're not trying to drive multiple connectors
-                * with a single CRTC, since our cloning support may not
-                * match the BIOS.
-                */
-               for (j = 0; j < count; j++) {
-                       if (crtcs[j] == new_crtc) {
-                               DRM_DEBUG_KMS("fallback: cloned configuration\n");
-                               goto bail;
-                       }
-               }
-
-               DRM_DEBUG_KMS("looking for cmdline mode on connector %s\n",
-                             connector->name);
-
-               /* go for command line mode first */
-               modes[i] = drm_pick_cmdline_mode(fb_conn);
-
-               /* try for preferred next */
-               if (!modes[i]) {
-                       DRM_DEBUG_KMS("looking for preferred mode on connector %s %d\n",
-                                     connector->name, connector->has_tile);
-                       modes[i] = drm_has_preferred_mode(fb_conn, width,
-                                                         height);
-               }
-
-               /* No preferred mode marked by the EDID? Are there any modes? */
-               if (!modes[i] && !list_empty(&connector->modes)) {
-                       DRM_DEBUG_KMS("using first mode listed on connector %s\n",
-                                     connector->name);
-                       modes[i] = list_first_entry(&connector->modes,
-                                                   struct drm_display_mode,
-                                                   head);
-               }
-
-               /* last resort: use current mode */
-               if (!modes[i]) {
-                       /*
-                        * IMPORTANT: We want to use the adjusted mode (i.e.
-                        * after the panel fitter upscaling) as the initial
-                        * config, not the input mode, which is what crtc->mode
-                        * usually contains. But since our current
-                        * code puts a mode derived from the post-pfit timings
-                        * into crtc->mode this works out correctly.
-                        *
-                        * This is crtc->mode and not crtc->state->mode for the
-                        * fastboot check to work correctly. crtc_state->mode has
-                        * I915_MODE_FLAG_INHERITED, which we clear to force check
-                        * state.
-                        */
-                       DRM_DEBUG_KMS("looking for current mode on connector %s\n",
-                                     connector->name);
-                       modes[i] = &connector->state->crtc->mode;
-               }
-               crtcs[i] = new_crtc;
-
-               DRM_DEBUG_KMS("connector %s on [CRTC:%d:%s]: %dx%d%s\n",
-                             connector->name,
-                             connector->state->crtc->base.id,
-                             connector->state->crtc->name,
-                             modes[i]->hdisplay, modes[i]->vdisplay,
-                             modes[i]->flags & DRM_MODE_FLAG_INTERLACE ? "i" :"");
-
-               fallback = false;
-               conn_configured |= BIT(i);
-       }
-
-       if (conn_configured != conn_seq) { /* repeat until no more are found */
-               conn_seq = conn_configured;
-               goto retry;
-       }
-
-       /*
-        * If the BIOS didn't enable everything it could, fall back to have the
-        * same user experiencing of lighting up as much as possible like the
-        * fbdev helper library.
-        */
-       if (num_connectors_enabled != num_connectors_detected &&
-           num_connectors_enabled < INTEL_INFO(dev_priv)->num_pipes) {
-               DRM_DEBUG_KMS("fallback: Not all outputs enabled\n");
-               DRM_DEBUG_KMS("Enabled: %i, detected: %i\n", num_connectors_enabled,
-                             num_connectors_detected);
-               fallback = true;
-       }
-
-       if (fallback) {
-bail:
-               DRM_DEBUG_KMS("Not using firmware configuration\n");
-               memcpy(enabled, save_enabled, count);
-               ret = false;
-       }
-
-       drm_modeset_drop_locks(&ctx);
-       drm_modeset_acquire_fini(&ctx);
-
-       kfree(save_enabled);
-       return ret;
-}
-
 static const struct drm_fb_helper_funcs intel_fb_helper_funcs = {
-       .initial_config = intel_fb_initial_config,
        .fb_probe = intelfb_create,
 };