From: Lee Shawn C <shawn.c.lee@intel.com> To: intel-gfx@lists.freedesktop.org Cc: Jani Nikula <jani.nikula@intel.com> Subject: [PATCH v2] drm/i915: update rawclk also on resume Date: Fri, 1 Nov 2019 22:45:36 +0800 [thread overview] Message-ID: <20191101144536.23558-1-shawn.c.lee@intel.com> (raw) In-Reply-To: <20191031111407.12493-1-jani.nikula@intel.com> Since CNP it's possible for rawclk to have two different values, 19.2 and 24 MHz. If the value indicated by SFUSE_STRAP register is different from the power on default for PCH_RAWCLK_FREQ, we'll end up having a mismatch between the rawclk hardware and software states after suspend/resume. On previous platforms this used to work by accident, because the power on defaults worked just fine. Update the rawclk also on resume. The natural place to do this is intel_modeset_init_hw(), however VLV/CHV need it done before intel_power_domains_init_hw(). Split the update accordingly, even if that's slighly ugly. This means moving the update later for non-VLV/CHV platforms in probe. v2: Do intel_update_rawclk() at intel_power_domains_init_hw(). Rawclk will be configured with proper setting and executed before intel_modeset_init_hw(). Reported-by: Shawn Lee <shawn.c.lee@intel.com> Cc: Shawn Lee <shawn.c.lee@intel.com> Cc: Ville Syrjala <ville.syrjala@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Lee Shawn C <shawn.c.lee@intel.com> --- drivers/gpu/drm/i915/display/intel_display_power.c | 6 ++++++ drivers/gpu/drm/i915/i915_drv.c | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c index dd2a50b8ba0a..089ba6cbb348 100644 --- a/drivers/gpu/drm/i915/display/intel_display_power.c +++ b/drivers/gpu/drm/i915/display/intel_display_power.c @@ -4914,6 +4914,12 @@ void intel_power_domains_init_hw(struct drm_i915_private *i915, bool resume) power_domains->initializing = true; + /* + * Must happen before power domain init on VLV/CHV, the rest update + * rawclk can be done here as well. + */ + intel_update_rawclk(i915); + if (INTEL_GEN(i915) >= 11) { icl_display_core_init(i915, resume); } else if (IS_CANNONLAKE(i915)) { diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index f2d3d754af37..1f36e3c3f967 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -716,9 +716,6 @@ static int i915_driver_modeset_probe(struct drm_device *dev) if (ret) goto cleanup_vga_client; - /* must happen before intel_power_domains_init_hw() on VLV/CHV */ - intel_update_rawclk(dev_priv); - intel_power_domains_init_hw(dev_priv, false); intel_csr_ucode_init(dev_priv); -- 2.17.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Lee Shawn C <shawn.c.lee@intel.com> To: intel-gfx@lists.freedesktop.org Cc: Jani Nikula <jani.nikula@intel.com> Subject: [Intel-gfx] [PATCH v2] drm/i915: update rawclk also on resume Date: Fri, 1 Nov 2019 22:45:36 +0800 [thread overview] Message-ID: <20191101144536.23558-1-shawn.c.lee@intel.com> (raw) Message-ID: <20191101144536.03Tw5xZZ9r4o6fMUW8BBYR5PWnJ_jc0RcKvXxSqFZtA@z> (raw) In-Reply-To: <20191031111407.12493-1-jani.nikula@intel.com> Since CNP it's possible for rawclk to have two different values, 19.2 and 24 MHz. If the value indicated by SFUSE_STRAP register is different from the power on default for PCH_RAWCLK_FREQ, we'll end up having a mismatch between the rawclk hardware and software states after suspend/resume. On previous platforms this used to work by accident, because the power on defaults worked just fine. Update the rawclk also on resume. The natural place to do this is intel_modeset_init_hw(), however VLV/CHV need it done before intel_power_domains_init_hw(). Split the update accordingly, even if that's slighly ugly. This means moving the update later for non-VLV/CHV platforms in probe. v2: Do intel_update_rawclk() at intel_power_domains_init_hw(). Rawclk will be configured with proper setting and executed before intel_modeset_init_hw(). Reported-by: Shawn Lee <shawn.c.lee@intel.com> Cc: Shawn Lee <shawn.c.lee@intel.com> Cc: Ville Syrjala <ville.syrjala@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Lee Shawn C <shawn.c.lee@intel.com> --- drivers/gpu/drm/i915/display/intel_display_power.c | 6 ++++++ drivers/gpu/drm/i915/i915_drv.c | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c index dd2a50b8ba0a..089ba6cbb348 100644 --- a/drivers/gpu/drm/i915/display/intel_display_power.c +++ b/drivers/gpu/drm/i915/display/intel_display_power.c @@ -4914,6 +4914,12 @@ void intel_power_domains_init_hw(struct drm_i915_private *i915, bool resume) power_domains->initializing = true; + /* + * Must happen before power domain init on VLV/CHV, the rest update + * rawclk can be done here as well. + */ + intel_update_rawclk(i915); + if (INTEL_GEN(i915) >= 11) { icl_display_core_init(i915, resume); } else if (IS_CANNONLAKE(i915)) { diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index f2d3d754af37..1f36e3c3f967 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -716,9 +716,6 @@ static int i915_driver_modeset_probe(struct drm_device *dev) if (ret) goto cleanup_vga_client; - /* must happen before intel_power_domains_init_hw() on VLV/CHV */ - intel_update_rawclk(dev_priv); - intel_power_domains_init_hw(dev_priv, false); intel_csr_ucode_init(dev_priv); -- 2.17.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-11-01 6:46 UTC|newest] Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-31 11:14 [PATCH] drm/i915: update rawclk also on resume Jani Nikula 2019-10-31 11:14 ` [Intel-gfx] " Jani Nikula 2019-10-31 13:53 ` ✓ Fi.CI.BAT: success for " Patchwork 2019-10-31 13:53 ` [Intel-gfx] " Patchwork 2019-10-31 13:56 ` [PATCH] " Ville Syrjälä 2019-10-31 13:56 ` [Intel-gfx] " Ville Syrjälä 2019-11-01 3:17 ` Lee, Shawn C 2019-11-01 3:17 ` [Intel-gfx] " Lee, Shawn C 2019-11-01 6:56 ` ✗ Fi.CI.BUILD: failure for drm/i915: update rawclk also on resume (rev2) Patchwork 2019-11-01 6:56 ` [Intel-gfx] " Patchwork 2019-11-01 9:03 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: update rawclk also on resume (rev3) Patchwork 2019-11-01 9:03 ` [Intel-gfx] " Patchwork 2019-11-01 9:33 ` ✓ Fi.CI.BAT: success " Patchwork 2019-11-01 9:33 ` [Intel-gfx] " Patchwork 2019-11-01 13:18 ` ✓ Fi.CI.IGT: success for drm/i915: update rawclk also on resume Patchwork 2019-11-01 13:18 ` [Intel-gfx] " Patchwork 2019-11-01 14:45 ` Lee Shawn C [this message] 2019-11-01 14:45 ` [Intel-gfx] [PATCH v2] " Lee Shawn C 2019-11-01 16:29 ` [PATCH v3] " Lee Shawn C 2019-11-01 16:29 ` [Intel-gfx] " Lee Shawn C 2019-11-01 14:24 ` Jani Nikula 2019-11-01 14:24 ` [Intel-gfx] " Jani Nikula 2019-11-01 14:20 [PATCH v2] " Jani Nikula 2019-11-04 15:31 ` Ville Syrjälä 2019-11-05 7:31 ` Jani Nikula
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191101144536.23558-1-shawn.c.lee@intel.com \ --to=shawn.c.lee@intel.com \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.