Message ID | 20170828121810.13112-1-marta.lofstedt@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Mon, Aug 28, 2017 at 03:18:10PM +0300, Marta Lofstedt wrote: > Commit 6e644626945c7c1a7f4d4f83b806b898297846d0 was I fixed that commit reference to use the correct format and pushed the patch to dinq. Thanks for fixing my mess. > supposed to solve below bug. However, the patch I tested > is not the same as the one that got merged. > With this addition the test pass. > > V2: removed unused: "struct intel_crtc *intel_crtc" > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101664 > > Signed-off-by: Marta Lofstedt <marta.lofstedt@intel.com> > --- > drivers/gpu/drm/i915/intel_pipe_crc.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.c b/drivers/gpu/drm/i915/intel_pipe_crc.c > index 4e22bb927fed..96043a51c1bf 100644 > --- a/drivers/gpu/drm/i915/intel_pipe_crc.c > +++ b/drivers/gpu/drm/i915/intel_pipe_crc.c > @@ -919,7 +919,6 @@ int intel_crtc_set_crc_source(struct drm_crtc *crtc, const char *source_name, > { > struct drm_i915_private *dev_priv = crtc->dev->dev_private; > struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[crtc->index]; > - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > enum intel_display_power_domain power_domain; > enum intel_pipe_crc_source source; > u32 val = 0; /* shut up gcc */ > @@ -951,8 +950,6 @@ int intel_crtc_set_crc_source(struct drm_crtc *crtc, const char *source_name, > else if ((IS_HASWELL(dev_priv) || > IS_BROADWELL(dev_priv)) && crtc->index == PIPE_A) > hsw_pipe_A_crc_wa(dev_priv, false); > - > - hsw_enable_ips(intel_crtc); > } > > pipe_crc->skipped = 0; > -- > 2.11.0
diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.c b/drivers/gpu/drm/i915/intel_pipe_crc.c index 4e22bb927fed..96043a51c1bf 100644 --- a/drivers/gpu/drm/i915/intel_pipe_crc.c +++ b/drivers/gpu/drm/i915/intel_pipe_crc.c @@ -919,7 +919,6 @@ int intel_crtc_set_crc_source(struct drm_crtc *crtc, const char *source_name, { struct drm_i915_private *dev_priv = crtc->dev->dev_private; struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[crtc->index]; - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); enum intel_display_power_domain power_domain; enum intel_pipe_crc_source source; u32 val = 0; /* shut up gcc */ @@ -951,8 +950,6 @@ int intel_crtc_set_crc_source(struct drm_crtc *crtc, const char *source_name, else if ((IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) && crtc->index == PIPE_A) hsw_pipe_A_crc_wa(dev_priv, false); - - hsw_enable_ips(intel_crtc); } pipe_crc->skipped = 0;
Commit 6e644626945c7c1a7f4d4f83b806b898297846d0 was supposed to solve below bug. However, the patch I tested is not the same as the one that got merged. With this addition the test pass. V2: removed unused: "struct intel_crtc *intel_crtc" Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101664 Signed-off-by: Marta Lofstedt <marta.lofstedt@intel.com> --- drivers/gpu/drm/i915/intel_pipe_crc.c | 3 --- 1 file changed, 3 deletions(-)