On Mon, 2018-05-21 at 10:38 -0700, Paulo Zanoni wrote:
> Em Sex, 2018-05-18 às 13:15 -0700, José Roberto de Souza escreveu:
> > 'Pipe CSC enable' bit is more than just deprecated in ICL+, it was
> > disabled in 077ef1f09c25 'drm/i915/icl: Don't set pipe CSC/Gamma in
> > PLANE_COLOR_CTL' for primary and sprite planes as it was causing
> > those planes to be rendered as always black but it was not disabled
> > in cursor plane, also causing it to be rendered as black.
> >
> > As mentioned in the commit referenced above, this is a workaround
> > too and the CSC and gamma per plane values needs to be setup before
> > enable CSC and gamma again.
> >
> > BSpec: 4278 and 7635
> >
> > Cc: James Ausmus <james.ausmus@xxxxxxxxx>
> > Cc: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx>
> > Signed-off-by: José Roberto de Souza <jose.souza@xxxxxxxxx>
> > ---
> > drivers/gpu/drm/i915/intel_display.c | 10 ++++++----
> > 1 file changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_display.c
> > b/drivers/gpu/drm/i915/intel_display.c
> > index c9ec88acad9c..93157d0ec870 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -9673,12 +9673,14 @@ static u32 i9xx_cursor_ctl(const struct
> > intel_crtc_state *crtc_state,
> > struct drm_i915_private *dev_priv =
> > to_i915(plane_state->base.plane->dev);
> > struct intel_crtc *crtc = to_intel_crtc(crtc_state-
> > > base.crtc);
> >
> > - u32 cntl;
> > + u32 cntl = 0;
> >
> > - cntl = MCURSOR_GAMMA_ENABLE;
> > + if (INTEL_GEN(dev_priv) < 11) {
>
> Bikeshedding: I know the commit you're based on has the same style as
> this one, but generally we prefer "inclusive" checks, so here we'd be
> checking for "<= 10" in order to run the gen10-and-older code. I can
> change this and the checkpatch issue while applying.
Sounds good, thanks
>
> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx>
>
> > + cntl |= MCURSOR_GAMMA_ENABLE;
> >
> > - if (HAS_DDI(dev_priv))
> > - cntl |= CURSOR_PIPE_CSC_ENABLE;
> > + if (HAS_DDI(dev_priv))
> > + cntl |= CURSOR_PIPE_CSC_ENABLE;
> > + }
> >
> > if (INTEL_GEN(dev_priv) < 5 && !IS_G4X(dev_priv))
> > cntl |= MCURSOR_PIPE_SELECT(crtc->pipe);
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
