[Intel-gfx] [PATCH v6] drm/i915/icl: Set GCP_COLOR_INDICATION only for 10/12 bit deep color

[Ville Syrjälä]

On Fri, Apr 05, 2019 at 09:34:42AM -0700, Clinton Taylor wrote:
> What happened to the reset of the patch?

It should have been a separate patch. Also I think this [1] oneliner
might be all we need.

[1] https://lists.freedesktop.org/archives/intel-gfx/2019-April/194708.html

> 
> -Clint
> 
> 
> On 4/4/19 10:55 PM, Aditya Swarup wrote:
> > From: Clinton Taylor <Clinton.A.Taylor at intel.com>
> >
> > v2: Fix commit msg to reflect why issue occurs(Jani)
> > Set GCP_COLOR_INDICATION only when we set 10/12 bit deep color.
> >
> > Changing settings from 10/12 bit deep color to 8 bit(& vice versa)
> > doesn't work correctly using xrandr max bpc property. When we
> > connect a monitor which supports deep color, the highest deep color
> > setting is selected; which sets GCP_COLOR_INDICATION. When we change
> > the setting to 8 bit color, we still set GCP_COLOR_INDICATION which
> > doesn't allow the switch back to 8 bit color.
> >
> > v3,4: Add comments & drop changes in intel_hdmi_compute_config(Ville)
> > Since HSW+, GCP_COLOR_INDICATION is not required for 8bpc.
> >
> > Drop the changes in intel_hdmi_compute_config as desired_bpp
> > is needed to change values for pipe_bpp based on bw_constrained flag.
> >
> > v5: Fix missing logical && in condition for setting GCP_COLOR_INDICATION.
> >
> > v6: Fix comment formatting (Ville)
> >
> > Signed-off-by: Clinton Taylor <Clinton.A.Taylor at intel.com>
> > Signed-off-by: Aditya Swarup <aditya.swarup at intel.com>
> > Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > Cc: Jani Nikula <jani.nikula at intel.com>
> > Cc: Manasi Navare <manasi.d.navare at intel.com>
> > ---
> >   drivers/gpu/drm/i915/intel_hdmi.c | 7 +++++--
> >   1 file changed, 5 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> > index 5ccb305a6e1c..f2c0aba4371b 100644
> > --- a/drivers/gpu/drm/i915/intel_hdmi.c
> > +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> > @@ -962,8 +962,11 @@ static void intel_hdmi_compute_gcp_infoframe(struct intel_encoder *encoder,
> >   	crtc_state->infoframes.enable |=
> >   		intel_hdmi_infoframe_enable(HDMI_PACKET_TYPE_GENERAL_CONTROL);
> >   
> > -	/* Indicate color depth whenever the sink supports deep color */
> > -	if (hdmi_sink_is_deep_color(conn_state))
> > +	/* Indicate color depth whenever the sink supports deep color
> > +	 * Also, 8bpc + color depth indication is no longer supported
> > +	 * for HSW+ platforms.
> > +	 */
> > +	if (hdmi_sink_is_deep_color(conn_state) && crtc_state->pipe_bpp > 24)
> >   		crtc_state->infoframes.gcp |= GCP_COLOR_INDICATION;
> >   
> >   	/* Enable default_phase whenever the display mode is suitably aligned */

-- 
Ville Syrjälä
Intel