mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-20 18:54:09 +08:00
e42aeef123
This reverts the following patches:d55dbd06bbdrm/i915: Allow nonblocking update of pageflips.15c86bdb76drm/i915: Check for unpin correctness.95c2ccdc82Reapply "drm/i915: Avoid stalling on pending flips for legacy cursor updates"a6747b7304drm/i915: Make unpin async.03f476e1fcdrm/i915: Prepare connectors for nonblocking checks.2099deffefdrm/i915: Pass atomic states to fbc update functions.ee7171af72drm/i915: Remove reset_counter from intel_crtc.2ee004f7c5drm/i915: Remove queue_flip pointer.b8d2afae55drm/i915: Remove use_mmio_flip kernel parameter.8dd634d922drm/i915: Remove cs based page flip support.143f73b3bfdrm/i915: Rework intel_crtc_page_flip to be almost atomic, v3.84fc494b64drm/i915: Add the exclusive fence to plane_state.6885843ae1drm/i915: Convert flip_work to a list.aa420ddd8edrm/i915: Allow mmio updates on all platforms, v2.afee4d8707Revert "drm/i915: Avoid stalling on pending flips for legacy cursor updates" "drm/i915: Allow nonblocking update of pageflips" should have been split up, misses a proper commit message and seems to cause issues in the legacy page_flip path as demonstrated by kms_flip. "drm/i915: Make unpin async" doesn't handle the unthrottled cursor updates correctly, leading to an apparent pin count leak. This is caught by the WARN_ON in i915_gem_object_do_pin which screams if we have more than DRM_I915_GEM_OBJECT_MAX_PIN_COUNT pins. Unfortuantely we can't just revert these two because this patch series came with a built-in bisect breakage in the form of temporarily removing the unthrottled cursor update hack for legacy cursor ioctl. Therefore there's no other option than to revert the entire pile :( There's one tiny conflict in intel_drv.h due to other patches, nothing serious. Normally I'd wait a bit longer with doing a maintainer revert, but since the minimal set of patches we need to revert (due to the bisect breakage) is so big, time is running out fast. And very soon (especially after a few attempts at fixing issues) it'll be really hard to revert things cleanly. Lessons learned: - Not a good idea to rush the review (done by someone fairly new to the area) and not make sure domain experts had a chance to read it. - Patches should be properly split up. I only looked at the two patches that should be reverted in detail, but both look like the mix up different things in one patch. - Patches really should have proper commit messages. Especially when doing more than one thing, and especially when touching critical and tricky core code. - Building a patch series and r-b stamping it when it has a built-in bisect breakage is not a good idea. - I also think we need to stop building up technical debt by postponing atomic igt testcases even longer. I think it's clear that there's enough corner cases in this beast that we really need to have the testcases _before_ the next step lands. (cherry picked from commit5a21b6650afrom drm-intel-next-queeud) Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com> Cc: John Harrison <John.C.Harrison@Intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Acked-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Acked-by: Dave Airlie <airlied@redhat.com> Acked-by: Jani Nikula <jani.nikula@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
72 lines
2.1 KiB
C
72 lines
2.1 KiB
C
/*
|
|
* Copyright © 2015 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.
|
|
*
|
|
*/
|
|
|
|
#ifndef _I915_PARAMS_H_
|
|
#define _I915_PARAMS_H_
|
|
|
|
#include <linux/cache.h> /* for __read_mostly */
|
|
|
|
struct i915_params {
|
|
int modeset;
|
|
int panel_ignore_lid;
|
|
int semaphores;
|
|
int lvds_channel_mode;
|
|
int panel_use_ssc;
|
|
int vbt_sdvo_panel_type;
|
|
int enable_rc6;
|
|
int enable_dc;
|
|
int enable_fbc;
|
|
int enable_ppgtt;
|
|
int enable_execlists;
|
|
int enable_psr;
|
|
unsigned int preliminary_hw_support;
|
|
int disable_power_well;
|
|
int enable_ips;
|
|
int invert_brightness;
|
|
int enable_cmd_parser;
|
|
int enable_guc_loading;
|
|
int enable_guc_submission;
|
|
int guc_log_level;
|
|
int use_mmio_flip;
|
|
int mmio_debug;
|
|
int edp_vswing;
|
|
unsigned int inject_load_failure;
|
|
/* leave bools at the end to not create holes */
|
|
bool enable_hangcheck;
|
|
bool fastboot;
|
|
bool prefault_disable;
|
|
bool load_detect_test;
|
|
bool reset;
|
|
bool disable_display;
|
|
bool verbose_state_checks;
|
|
bool nuclear_pageflip;
|
|
bool enable_dp_mst;
|
|
bool enable_dpcd_backlight;
|
|
};
|
|
|
|
extern struct i915_params i915 __read_mostly;
|
|
|
|
#endif
|
|
|