| Message ID | 1440683046-27110-6-git-send-email-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 7277
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
ILK -1 253/253 252/253
SNB 248/248 248/248
IVB 281/281 281/281
BYT -2 234/234 232/234
HSW 317/317 317/317
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*ILK igt@gem_reloc_vs_gpu@forked-interruptible-faulting-reloc-thrashing PASS(1) DMESG_WARN(1)
*BYT igt@gem_partial_pwrite_pread@reads-display PASS(1) FAIL(1)
*BYT igt@gem_partial_pwrite_pread@reads-uncached PASS(1) FAIL(1)
Note: You need to pay more attention to line start with '*'
On 08/27/2015 06:44 AM, Maarten Lankhorst wrote: > This is done as a separate commit, to make it easier to revert > when things break. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > --- > drivers/gpu/drm/i915/i915_drv.h | 1 - > drivers/gpu/drm/i915/i915_params.c | 5 ----- > drivers/gpu/drm/i915/intel_display.c | 3 +-- > 3 files changed, 1 insertion(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 61244455347f..c75d343ff26b 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -2628,7 +2628,6 @@ struct i915_params { > int enable_cmd_parser; > /* leave bools at the end to not create holes */ > bool enable_hangcheck; > - bool fastboot; > bool prefault_disable; > bool load_detect_test; > bool reset; > diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c > index 5ae4b0aba564..47d41da9d942 100644 > --- a/drivers/gpu/drm/i915/i915_params.c > +++ b/drivers/gpu/drm/i915/i915_params.c > @@ -40,7 +40,6 @@ struct i915_params i915 __read_mostly = { > .preliminary_hw_support = IS_ENABLED(CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT), > .disable_power_well = 1, > .enable_ips = 1, > - .fastboot = 0, > .prefault_disable = 0, > .load_detect_test = 0, > .reset = true, > @@ -132,10 +131,6 @@ MODULE_PARM_DESC(disable_power_well, > module_param_named(enable_ips, i915.enable_ips, int, 0600); > MODULE_PARM_DESC(enable_ips, "Enable IPS (default: true)"); > > -module_param_named(fastboot, i915.fastboot, bool, 0600); > -MODULE_PARM_DESC(fastboot, > - "Try to skip unnecessary mode sets at boot time (default: false)"); > - > module_param_named_unsafe(prefault_disable, i915.prefault_disable, bool, 0600); > MODULE_PARM_DESC(prefault_disable, > "Disable page prefaulting for pread/pwrite/reloc (default:false). " > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index d3874a68cdb9..b4fb5dec2e38 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -13035,8 +13035,7 @@ static int intel_atomic_check(struct drm_device *dev, > if (ret) > return ret; > > - if (i915.fastboot && > - intel_pipe_config_compare(state->dev, > + if (intel_pipe_config_compare(state->dev, > to_intel_crtc_state(crtc->state), > pipe_config, true)) { > crtc_state->mode_changed = false; > Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Now we just need to test it everywhere...
On Thu, Sep 10, 2015 at 12:31:33PM -0700, Jesse Barnes wrote: > On 08/27/2015 06:44 AM, Maarten Lankhorst wrote: > > This is done as a separate commit, to make it easier to revert > > when things break. > > > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > > --- > > drivers/gpu/drm/i915/i915_drv.h | 1 - > > drivers/gpu/drm/i915/i915_params.c | 5 ----- > > drivers/gpu/drm/i915/intel_display.c | 3 +-- > > 3 files changed, 1 insertion(+), 8 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > > index 61244455347f..c75d343ff26b 100644 > > --- a/drivers/gpu/drm/i915/i915_drv.h > > +++ b/drivers/gpu/drm/i915/i915_drv.h > > @@ -2628,7 +2628,6 @@ struct i915_params { > > int enable_cmd_parser; > > /* leave bools at the end to not create holes */ > > bool enable_hangcheck; > > - bool fastboot; > > bool prefault_disable; > > bool load_detect_test; > > bool reset; > > diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c > > index 5ae4b0aba564..47d41da9d942 100644 > > --- a/drivers/gpu/drm/i915/i915_params.c > > +++ b/drivers/gpu/drm/i915/i915_params.c > > @@ -40,7 +40,6 @@ struct i915_params i915 __read_mostly = { > > .preliminary_hw_support = IS_ENABLED(CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT), > > .disable_power_well = 1, > > .enable_ips = 1, > > - .fastboot = 0, > > .prefault_disable = 0, > > .load_detect_test = 0, > > .reset = true, > > @@ -132,10 +131,6 @@ MODULE_PARM_DESC(disable_power_well, > > module_param_named(enable_ips, i915.enable_ips, int, 0600); > > MODULE_PARM_DESC(enable_ips, "Enable IPS (default: true)"); > > > > -module_param_named(fastboot, i915.fastboot, bool, 0600); > > -MODULE_PARM_DESC(fastboot, > > - "Try to skip unnecessary mode sets at boot time (default: false)"); > > - > > module_param_named_unsafe(prefault_disable, i915.prefault_disable, bool, 0600); > > MODULE_PARM_DESC(prefault_disable, > > "Disable page prefaulting for pread/pwrite/reloc (default:false). " > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > index d3874a68cdb9..b4fb5dec2e38 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -13035,8 +13035,7 @@ static int intel_atomic_check(struct drm_device *dev, > > if (ret) > > return ret; > > > > - if (i915.fastboot && > > - intel_pipe_config_compare(state->dev, > > + if (intel_pipe_config_compare(state->dev, > > to_intel_crtc_state(crtc->state), > > pipe_config, true)) { > > crtc_state->mode_changed = false; > > > > Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Entire series applied, thanks for patches&review. > Now we just need to test it everywhere... On that topic: The igt testcase for this is still mia. There's a JIRA for it, but atm JIRA is down :( Main gist that I think we need to check is fast modesets between different upscaled and native versions. Later on we can extend it (e.g. for userspace-controlled DRRS I want to use this same fast modeset infrastructure here too). Who's going to do that testcase? -Daniel
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 61244455347f..c75d343ff26b 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2628,7 +2628,6 @@ struct i915_params { int enable_cmd_parser; /* leave bools at the end to not create holes */ bool enable_hangcheck; - bool fastboot; bool prefault_disable; bool load_detect_test; bool reset; diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c index 5ae4b0aba564..47d41da9d942 100644 --- a/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c @@ -40,7 +40,6 @@ struct i915_params i915 __read_mostly = { .preliminary_hw_support = IS_ENABLED(CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT), .disable_power_well = 1, .enable_ips = 1, - .fastboot = 0, .prefault_disable = 0, .load_detect_test = 0, .reset = true, @@ -132,10 +131,6 @@ MODULE_PARM_DESC(disable_power_well, module_param_named(enable_ips, i915.enable_ips, int, 0600); MODULE_PARM_DESC(enable_ips, "Enable IPS (default: true)"); -module_param_named(fastboot, i915.fastboot, bool, 0600); -MODULE_PARM_DESC(fastboot, - "Try to skip unnecessary mode sets at boot time (default: false)"); - module_param_named_unsafe(prefault_disable, i915.prefault_disable, bool, 0600); MODULE_PARM_DESC(prefault_disable, "Disable page prefaulting for pread/pwrite/reloc (default:false). " diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index d3874a68cdb9..b4fb5dec2e38 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13035,8 +13035,7 @@ static int intel_atomic_check(struct drm_device *dev, if (ret) return ret; - if (i915.fastboot && - intel_pipe_config_compare(state->dev, + if (intel_pipe_config_compare(state->dev, to_intel_crtc_state(crtc->state), pipe_config, true)) { crtc_state->mode_changed = false;
This is done as a separate commit, to make it easier to revert when things break. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> --- drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/i915_params.c | 5 ----- drivers/gpu/drm/i915/intel_display.c | 3 +-- 3 files changed, 1 insertion(+), 8 deletions(-)