OrgACRN
/
clear-pkgs-linux-iot-lts2018
mirror of https://github.com/clearlinux-pkgs/linux-iot-lts2018.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
clear-pkgs-linux-iot-lts2018/0872-drm-i915-Introduce-ini...

658 lines
20 KiB
Diff
Raw Blame History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Bob Paauwe <bob.j.paauwe@intel.com>
Date: Fri, 22 Apr 2016 16:43:18 -0700
Subject: [PATCH] drm/i915: Introduce initial mode setting
For very specific use cases it may be desirable to have the kernel
driver do an initial mode set and/or splash screen type display without
having to enable a framebuffer console.
A primary goal for this feature is to have the display lit up as soon
as possible. A non-goal is the ability to detect and adapt to the
display configurations. In other words, the display configuration will
be a known/fixed configuration. In addition, it is expected that the
EDID information will be present and optimized so mode list creation
and traversal time is minimized.
Add a new module parameter that replaces the normal fbdev initialization
with a new initial mode set. When the parameter is off, follow the normal
program flow and (if configured) initialize fbdev and a framebuffer
console. When the parameter is on, do an atomic mode set with everything
off (no crtc's enabled).
Signed-off-by: Bob Paauwe <bob.j.paauwe@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: James Xiong <james.xiong@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Ported to linux-lts-2018 kernel base only.
Ran checkpatch.pl and fixed errors with new file.
Tracked-on:OLINUX-3112
Change-Id: I2f26670e337ad85c90ada0c15aca46d2e51bccb2
Signed-off-by: Daniel Charles <daniel.charles@intel.com>
---
drivers/gpu/drm/i915/Makefile | 3 +
drivers/gpu/drm/i915/i915_drv.c | 21 +-
drivers/gpu/drm/i915/i915_drv.h | 7 +
drivers/gpu/drm/i915/i915_params.c | 3 +
drivers/gpu/drm/i915/i915_params.h | 1 +
drivers/gpu/drm/i915/intel_initial_modeset.c | 489 +++++++++++++++++++
6 files changed, 519 insertions(+), 5 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_initial_modeset.c
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 517620b..c70a494 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -190,4 +190,7 @@ endif
# LPE Audio for VLV and CHT
i915-y += intel_lpe_audio.o
+# initial modeset
+i915-y += intel_initial_modeset.o
+
obj-$(CONFIG_DRM_I915) += i915.o
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 5c25a82..c7f4f94 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -690,9 +690,11 @@ static int i915_load_modeset_init(struct drm_device *dev)
if (INTEL_INFO(dev_priv)->num_pipes == 0)
return 0;
- ret = intel_fbdev_init(dev);
- if (ret)
- goto cleanup_gem;
+ if (!i915_modparams.enable_initial_modeset) {
+ ret = intel_fbdev_init(dev);
+ if (ret)
+ goto cleanup_gem;
+ }
/* Only enable hotplug handling once the fbdev is fully set up. */
intel_hpd_init(dev_priv);
@@ -1286,7 +1288,10 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
* irqs are fully enabled. We do it last so that the async config
* cannot run before the connectors are registered.
*/
- intel_fbdev_initial_config_async(dev);
+ if (i915_modparams.enable_initial_modeset)
+ intel_initial_mode_config_init(dev);
+ else
+ intel_fbdev_initial_config_async(dev);
/*
* We need to coordinate the hotplugs with the asynchronous fbdev
@@ -1475,6 +1480,11 @@ void i915_driver_unload(struct drm_device *dev)
i915_driver_unregister(dev_priv);
+ if (!i915_modparams.enable_initial_modeset)
+ intel_fbdev_fini(dev_priv);
+ else
+ intel_initial_mode_config_fini(dev);
+
if (i915_gem_suspend(dev_priv))
DRM_ERROR("failed to idle hardware; continuing to unload!\n");
@@ -1544,7 +1554,8 @@ static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
*/
static void i915_driver_lastclose(struct drm_device *dev)
{
- intel_fbdev_restore_mode(dev);
+ if (!i915_modparams.enable_initial_modeset)
+ intel_fbdev_restore_mode(dev);
vga_switcheroo_process_delayed_switch();
}
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index fb65396..03352f3 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1776,6 +1776,8 @@ struct drm_i915_private {
struct intel_pipe_crc pipe_crc[I915_MAX_PIPES];
#endif
+ struct work_struct initial_modeset_work;
+
/* dpll and cdclk state is protected by connection_mutex */
int num_shared_dpll;
struct intel_shared_dpll shared_dplls[I915_NUM_PLLS];
@@ -2764,6 +2766,11 @@ extern unsigned long i915_chipset_val(struct drm_i915_private *dev_priv);
extern unsigned long i915_mch_val(struct drm_i915_private *dev_priv);
extern unsigned long i915_gfx_val(struct drm_i915_private *dev_priv);
extern void i915_update_gfx_val(struct drm_i915_private *dev_priv);
+
+/* initial modesetting support */
+extern void intel_initial_mode_config_init(struct drm_device *dev);
+extern void intel_initial_mode_config_fini(struct drm_device *dev);
+
int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool on);
int intel_engines_init_mmio(struct drm_i915_private *dev_priv);
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index e594fd3..c588edb 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -178,6 +178,9 @@ i915_param_named(gvt_workload_priority, int, 0600,
"Set GVT-g workload priority, (range: (-1023, 1023), default: 0, "
"more positive value means higher priority).");
+i915_param_named(enable_initial_modeset, bool, 0400,
+ "Do initial modeset (default : false)");
+
i915_param_named(domain_scaler_owner, int, 0400,
"scaler owners for each domain and for each pipe ids can be from 0-F");
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index a0d1d7e..9df42e8 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -76,6 +76,7 @@ struct drm_printer;
| PVMMIO_PLANE_WM_UPDATE | PVMMIO_PPGTT_UPDATE \
| PVMMIO_GGTT_UPDATE ) \
param(int, gvt_workload_priority, 0) \
+ param(bool, enable_initial_modeset, false) \
param(bool, enable_gvt, false) \
param(bool, enable_conformance_check, true)
diff --git a/drivers/gpu/drm/i915/intel_initial_modeset.c b/drivers/gpu/drm/i915/intel_initial_modeset.c
new file mode 100644
index 0000000..4a3a6e7
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_initial_modeset.c
@@ -0,0 +1,489 @@
+/*
+ *
+ * Copyright (c) 2016 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions: *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * DOC: Boot-time mode setting.
+ *
+ * There exists a use case where the kernel graphics needs to be initialized
+ * with a valid display configuration with full display pipeline programming
+ * in place before user space is initialized and without a fbdev & fb console.
+ *
+ * The primary motivation is to allow early user space applications to
+ * display a frame (or frames) as soon as possible after user space starts.
+ * Eliminating the time it takes userspace to program the display configuration
+ * benefits this use case.
+ *
+ * By doing all the display programming in the kernel, it can be done in
+ * parallel with other kernel startup tasks without adding significant
+ * elapshed time before user space starts.
+ */
+
+#include "intel_drv.h"
+#include "i915_drv.h"
+
+static inline struct drm_encoder *get_encoder(struct drm_connector *connector)
+{
+ struct intel_encoder *encoder;
+
+ encoder = intel_attached_encoder(connector);
+
+ return &encoder->base;
+}
+
+/*
+ * This makes use of the video= kernel command line to determine what
+ * connectors to configure. See Documentation/fb/modedb.txt for details
+ * on the format. There are 3 specific cases that are used:
+ *
+ * 1) video=<connector>
+ * - assume monitor is connected, use EDID preferred mode
+ * 2) video=<connector:e>
+ * - use regardless of monitor connected, use EDID preferred mode
+ * 3) video=<connector:xres x yres @ refresh e
+ * - use regardless of monitor connected and use specified mode.
+ */
+static bool use_connector(struct drm_connector *connector)
+{
+ char *option = NULL;
+ struct drm_cmdline_mode *cl_mode = &connector->cmdline_mode;
+
+ fb_get_options(connector->name, &option);
+ if (option) {
+ switch (connector->force) {
+
+ case DRM_FORCE_OFF:
+ return false;
+ case DRM_FORCE_ON:
+ case DRM_FORCE_ON_DIGITAL:
+ return true;
+ case DRM_FORCE_UNSPECIFIED:
+ break;
+ }
+
+ connector->status = connector->funcs->detect(connector, true);
+ if (connector->status != connector_status_connected) {
+ connector->force = cl_mode->force;
+ connector->status = connector_status_connected;
+ }
+ return true;
+ }
+
+ return false;
+}
+
+static bool attach_crtc(struct drm_device *dev, struct drm_encoder *encoder,
+ uint32_t *used_crtcs)
+{
+ struct drm_crtc *possible_crtc;
+
+ if (encoder->crtc != NULL &&
+ !(*used_crtcs & drm_crtc_mask(encoder->crtc))) {
+ *used_crtcs |= drm_crtc_mask(encoder->crtc);
+ return true;
+ }
+
+ drm_for_each_crtc(possible_crtc, dev) {
+ if (!(encoder->possible_crtcs & drm_crtc_mask(possible_crtc))
+ || (*used_crtcs & drm_crtc_mask(possible_crtc)))
+ continue;
+ *used_crtcs |= drm_crtc_mask(possible_crtc);
+ encoder->crtc = possible_crtc;
+ return true;
+ }
+
+ return false;
+}
+
+static struct drm_display_mode *get_modeline(struct drm_i915_private *dev_priv,
+ struct drm_connector *connector,
+ int width, int height)
+{
+ struct drm_display_mode *mode;
+ struct drm_cmdline_mode *cl_mode = &connector->cmdline_mode;
+
+ /*
+ * fill_modes() takes a bit of time but is necessary.
+ * It is reading the EDID (or loading the EDID firmware blob
+ * and building the connector mode list. The time can be
+ * minimized by using a small EDID blob built into the kernel.
+ */
+
+ connector->funcs->fill_modes(connector, width, height);
+
+ /*
+ * Search the mode list. If a mode was specified using the
+ * video= command line, use that. Otherwise look for the
+ * preferred mode.
+ *
+ * <connector:><xres>x<yres>[M][R][-<bpp>][@<refresh>][i][m][eDd]
+ */
+ list_for_each_entry(mode, &connector->modes, head) {
+ if (cl_mode && cl_mode->specified &&
+ cl_mode->refresh_specified) {
+ if (mode->hdisplay == cl_mode->xres &&
+ mode->vdisplay == cl_mode->yres &&
+ mode->vrefresh == cl_mode->refresh)
+ return mode;
+ } else if (cl_mode && cl_mode->specified) {
+ if (mode->hdisplay == cl_mode->xres &&
+ mode->vdisplay == cl_mode->yres)
+ return mode;
+ } else {
+ if (mode->type & DRM_MODE_TYPE_PREFERRED)
+ return mode;
+ }
+ }
+
+ DRM_ERROR("Failed to find a valid mode.\n");
+ return NULL;
+}
+
+static int update_crtc_state(struct drm_atomic_state *state,
+ struct drm_display_mode *mode,
+ struct drm_crtc *crtc)
+{
+ struct drm_crtc_state *crtc_state;
+ int ret;
+
+ crtc_state = drm_atomic_get_crtc_state(state, crtc);
+ if (IS_ERR(crtc_state))
+ return PTR_ERR(crtc_state);
+
+ ret = drm_atomic_set_mode_for_crtc(crtc_state, mode);
+ if (ret) {
+ crtc_state->active = false;
+ return ret;
+ }
+
+ crtc_state->active = true;
+
+ if (!IS_GEN9(to_i915(state->dev)))
+ return 0;
+
+ WARN_ON(ret);
+
+ return 0;
+}
+
+static int update_connector_state(struct drm_atomic_state *state,
+ struct drm_connector *connector,
+ struct drm_crtc *crtc)
+{
+ struct drm_connector_state *conn_state;
+ int ret;
+
+ conn_state = drm_atomic_get_connector_state(state, connector);
+ if (IS_ERR(conn_state)) {
+ DRM_DEBUG_KMS("failed to get connector %s state\n",
+ connector->name);
+ return PTR_ERR(conn_state);
+ }
+
+ ret = drm_atomic_set_crtc_for_connector(conn_state, crtc);
+ if (ret) {
+ DRM_DEBUG_KMS("failed to set crtc for connector\n");
+ return ret;
+ }
+
+ return 0;
+}
+
+static int update_primary_plane_state(struct drm_atomic_state *state,
+ struct drm_crtc *crtc,
+ struct drm_display_mode *mode,
+ struct drm_framebuffer *fb)
+{
+ int hdisplay, vdisplay;
+ struct drm_plane_state *primary_state;
+ int ret;
+
+ primary_state = drm_atomic_get_plane_state(state, crtc->primary);
+ ret = drm_atomic_set_crtc_for_plane(primary_state, crtc);
+ if (ret)
+ return ret;
+ drm_mode_get_hv_timing(mode, &hdisplay, &vdisplay);
+ drm_atomic_set_fb_for_plane(primary_state, fb);
+ primary_state->crtc_x = 0;
+ primary_state->crtc_y = 0;
+ primary_state->crtc_w = hdisplay;
+ primary_state->crtc_h = vdisplay;
+ primary_state->src_x = 0 << 16;
+ primary_state->src_y = 0 << 16;
+ primary_state->src_w = hdisplay << 16;
+ primary_state->src_h = vdisplay << 16;
+ primary_state->rotation = DRM_MODE_ROTATE_0;
+
+ return 0;
+}
+
+static int update_atomic_state(struct drm_device *dev,
+ struct drm_atomic_state *state,
+ struct drm_connector *connector,
+ struct drm_display_mode *mode)
+{
+ struct drm_framebuffer *fb = NULL;
+ struct drm_crtc *crtc;
+ int ret;
+
+ if (get_encoder(connector))
+ crtc = get_encoder(connector)->crtc;
+ else
+ return -EINVAL;
+
+ ret = update_crtc_state(state, mode, crtc);
+ if (ret)
+ return ret;
+
+ /* attach connector to atomic state */
+ ret = update_connector_state(state, connector, crtc);
+ if (ret)
+ return ret;
+
+ /* Set up primary plane if a framebuffer is allocated */
+ if (fb) {
+ ret = update_primary_plane_state(state, crtc, mode, fb);
+ if (ret)
+ return ret;
+ }
+
+ return 0;
+}
+
+
+static int disable_planes(struct drm_device *dev,
+ struct drm_atomic_state *state)
+{
+ struct drm_plane *plane;
+ int ret;
+
+ drm_for_each_plane(plane, dev) {
+ struct drm_plane_state *plane_state;
+
+ plane->old_fb = plane->fb;
+
+ plane_state = drm_atomic_get_plane_state(state, plane);
+ if (IS_ERR(plane_state)) {
+ return PTR_ERR(plane_state);
+ }
+
+ ret = drm_atomic_set_crtc_for_plane(plane_state, NULL);
+ if (ret != 0)
+ return ret;
+
+ drm_atomic_set_fb_for_plane(plane_state, NULL);
+ }
+
+ return 0;
+}
+
+
+/*
+ * The modeset_config is scheduled to run via an async
+ * schedule call from the main driver load.
+ */
+static void modeset_config_fn(struct work_struct *work)
+{
+ struct drm_i915_private *dev_priv =
+ container_of(work, typeof(*dev_priv), initial_modeset_work);
+ struct drm_device *dev = &dev_priv->drm;
+ struct drm_connector *connector;
+ struct drm_connector_list_iter conn_iter;
+ struct drm_atomic_state *state;
+ struct drm_modeset_acquire_ctx ctx;
+ struct drm_plane *plane;
+ int ret;
+ bool found = false;
+ uint32_t used_crtcs = 0;
+ struct drm_display_mode *connector_mode[20];
+ struct drm_encoder *encoder;
+ struct drm_display_mode *mode;
+
+ memset(connector_mode, 0, sizeof(connector_mode));
+ mutex_lock(&dev->mode_config.mutex);
+ drm_connector_list_iter_begin(dev, &conn_iter);
+ drm_for_each_connector_iter(connector, &conn_iter) {
+ if (use_connector(connector)) {
+ encoder = get_encoder(connector);
+ if (!encoder)
+ continue;
+ if (!attach_crtc(dev, encoder, &used_crtcs))
+ continue;
+ mode = get_modeline(dev_priv, connector,
+ dev->mode_config.max_width,
+ dev->mode_config.max_height);
+ if (mode) {
+ found = true;
+ WARN_ON(connector->index >= 20);
+ connector_mode[connector->index] = mode;
+ }
+ }
+ }
+ drm_connector_list_iter_end(&conn_iter);
+ if (!found) {
+ used_crtcs = 0;
+ /* Try to detect attached connectors */
+ drm_connector_list_iter_begin(dev, &conn_iter);
+ drm_for_each_connector_iter(connector, &conn_iter) {
+ drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
+ if (connector->funcs && connector->funcs->detect)
+ connector->status = connector->funcs->detect(connector,
+ true);
+ else if (connector->helper_private && connector->helper_private->detect_ctx)
+ connector->status = connector->helper_private->detect_ctx(connector,
+ NULL, true);
+ drm_modeset_unlock(&dev->mode_config.connection_mutex);
+
+ if (connector->status == connector_status_connected) {
+ encoder = get_encoder(connector);
+ if (!encoder)
+ continue;
+ if (!attach_crtc(dev, encoder, &used_crtcs))
+ continue;
+ mode = get_modeline(dev_priv, connector,
+ dev->mode_config.max_width,
+ dev->mode_config.max_height);
+ if (mode) {
+ found = true;
+ WARN_ON(connector->index >= 20);
+ connector_mode[connector->index] = mode;
+ }
+ }
+ }
+ drm_connector_list_iter_end(&conn_iter);
+ }
+ mutex_unlock(&dev->mode_config.mutex);
+
+ if (!found)
+ return;
+
+ state = drm_atomic_state_alloc(dev);
+ if (!state)
+ return;
+
+ mutex_lock(&dev->mode_config.mutex);
+
+ drm_modeset_acquire_init(&ctx, 0);
+ state->acquire_ctx = &ctx;
+retry:
+ ret = drm_modeset_lock_all_ctx(dev, &ctx);
+ if (ret == -EDEADLK) {
+ drm_modeset_backoff(&ctx);
+ goto retry;
+ } else if (ret) {
+ goto out;
+ }
+
+ ret = disable_planes(dev, state);
+ if (ret)
+ goto fail;
+
+ /*
+ * For each connector that we want to set up, update the atomic
+ * state to include the connector and crtc mode.
+ */
+ drm_connector_list_iter_begin(dev, &conn_iter);
+ drm_for_each_connector_iter(connector, &conn_iter) {
+ if (connector_mode[connector->index]) {
+ ret = update_atomic_state(dev, state, connector,
+ connector_mode[connector->index]);
+ if (ret)
+ goto fail;
+ }
+ }
+ drm_connector_list_iter_end(&conn_iter);
+
+ ret = drm_atomic_commit(state);
+ if (ret)
+ goto fail;
+ goto out;
+
+fail:
+ if (ret == -EDEADLK) {
+ DRM_DEBUG_KMS("modeset commit deadlock, retry...\n");
+ drm_modeset_backoff(&ctx);
+ drm_atomic_state_clear(state);
+ goto retry;
+ }
+
+out:
+ if (!ret) {
+ drm_for_each_plane(plane, dev) {
+ if (plane->old_fb)
+ drm_framebuffer_unreference(plane->old_fb);
+ }
+ }
+ drm_modeset_drop_locks(&ctx);
+ drm_modeset_acquire_fini(&ctx);
+ drm_atomic_state_put(state);
+
+ mutex_unlock(&dev->mode_config.mutex);
+}
+
+void intel_initial_mode_config_init(struct drm_device *dev)
+{
+ struct drm_i915_private *dev_priv = to_i915(dev);
+
+ INIT_WORK(&dev_priv->initial_modeset_work, modeset_config_fn);
+ schedule_work(&dev_priv->initial_modeset_work);
+}
+
+static void initial_mode_destroy(struct drm_device *dev)
+{
+ struct drm_atomic_state *state;
+ struct drm_modeset_acquire_ctx ctx;
+ int ret;
+
+ state = drm_atomic_state_alloc(dev);
+ if (!state)
+ return;
+
+ drm_modeset_acquire_init(&ctx, 0);
+ state->acquire_ctx = &ctx;
+ drm_modeset_lock_all_ctx(dev, &ctx);
+
+retry:
+ ret = disable_planes(dev, state);
+ if (ret == -EDEADLK) {
+ drm_modeset_backoff(&ctx);
+ drm_atomic_state_clear(state);
+ goto retry;
+ }
+
+ ret = drm_atomic_commit(state);
+ if (ret == -EDEADLK) {
+ drm_modeset_backoff(&ctx);
+ drm_atomic_state_clear(state);
+ goto retry;
+ }
+
+ drm_modeset_drop_locks(&ctx);
+ drm_modeset_acquire_fini(&ctx);
+}
+
+void intel_initial_mode_config_fini(struct drm_device *dev)
+{
+ struct drm_i915_private *dev_priv = to_i915(dev);
+
+ flush_work(&dev_priv->initial_modeset_work);
+ initial_mode_destroy(dev);
+}
--
2.21.0
Reference in New Issue View Git Blame Copy Permalink