[v2,6/7] drm/i915: No 10bit gamma on desktop gen3 parts

Message ID	20230413164916.4221-7-ville.syrjala@linux.intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <dri-devel-bounces@lists.freedesktop.org> From: Ville Syrjala <ville.syrjala@linux.intel.com> To: intel-gfx@lists.freedesktop.org Subject: [PATCH v2 6/7] drm/i915: No 10bit gamma on desktop gen3 parts Date: Thu, 13 Apr 2023 19:49:15 +0300 Message-Id: <20230413164916.4221-7-ville.syrjala@linux.intel.com> In-Reply-To: <20230413164916.4221-1-ville.syrjala@linux.intel.com> References: <20230413164916.4221-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: list Cc: dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
Series	drm/i915: CTM stuff mostly \| expand [v2,0/7] drm/i915: CTM stuff mostly [v2,1/7] drm/uapi: Document CTM matrix better [v2,2/7] drm/i915: Expose crtc CTM property on ilk/snb [v2,3/7] drm/i915: Fix CHV CGM CSC coefficient sign handling [v2,4/7] drm/i915: Always enable CGM CSC on CHV [v2,5/7] drm/i915: Implement CTM property support for VLV [v2,6/7] drm/i915: No 10bit gamma on desktop gen3 parts [v2,7/7] drm/i915: Do state check for color management changes

Message ID

20230413164916.4221-7-ville.syrjala@linux.intel.com (mailing list archive)

State

New, archived

Headers

From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH v2 6/7] drm/i915: No 10bit gamma on desktop gen3 parts
Date: Thu, 13 Apr 2023 19:49:15 +0300
Message-Id: <20230413164916.4221-7-ville.syrjala@linux.intel.com>
In-Reply-To: <20230413164916.4221-1-ville.syrjala@linux.intel.com>
References: <20230413164916.4221-1-ville.syrjala@linux.intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: list
Cc: dri-devel@lists.freedesktop.org
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>

Series

drm/i915: CTM stuff mostly | expand

Commit Message

Ville Syrjälä April 13, 2023, 4:49 p.m. UTC

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Apparently desktop gen3 parts don't support the
10bit gamma mode at all. Stop claiming otherwise.

As is the case with pipe A on gen3 mobile parts, the
PIPECONF gamma mode bit can be set but it has no
effect on the output.

PNV seems to be the only slight exception, but generally
the desktop PNV variant looks more like a mobile part so
this is not entirely surprising.

Fixes: 67630bacae23 ("drm/i915: Add 10bit gamma mode for gen2/3")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_pci.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Shankar, Uma May 25, 2023, 9:25 p.m. UTC | #1

> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Ville Syrjala
> Sent: Thursday, April 13, 2023 10:19 PM
> To: intel-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Subject: [Intel-gfx] [PATCH v2 6/7] drm/i915: No 10bit gamma on desktop gen3 parts
> 
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Apparently desktop gen3 parts don't support the 10bit gamma mode at all. Stop
> claiming otherwise.
> 
> As is the case with pipe A on gen3 mobile parts, the PIPECONF gamma mode bit can
> be set but it has no effect on the output.
> 
> PNV seems to be the only slight exception, but generally the desktop PNV variant
> looks more like a mobile part so this is not entirely surprising.

Couldn't check the relevant spec to re-confirm, trusting your judgment here.
Reviewed-by: Uma Shankar <uma.shankar@intel.com>

> Fixes: 67630bacae23 ("drm/i915: Add 10bit gamma mode for gen2/3")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_pci.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index
> cddb6e197972..305c05c3f93b 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -250,13 +250,13 @@ static const struct intel_device_info i865g_info = {
>  	.dma_mask_size = 32, \
>  	I9XX_PIPE_OFFSETS, \
>  	I9XX_CURSOR_OFFSETS, \
> -	I9XX_COLORS, \
>  	GEN_DEFAULT_PAGE_SIZES, \
>  	GEN_DEFAULT_REGIONS
> 
>  static const struct intel_device_info i915g_info = {
>  	GEN3_FEATURES,
>  	PLATFORM(INTEL_I915G),
> +	I845_COLORS,
>  	.has_coherent_ggtt = false,
>  	.display.cursor_needs_physical = 1,
>  	.display.has_overlay = 1,
> @@ -268,6 +268,7 @@ static const struct intel_device_info i915g_info = {  static
> const struct intel_device_info i915gm_info = {
>  	GEN3_FEATURES,
>  	PLATFORM(INTEL_I915GM),
> +	I9XX_COLORS,
>  	.is_mobile = 1,
>  	.display.cursor_needs_physical = 1,
>  	.display.has_overlay = 1,
> @@ -281,6 +282,7 @@ static const struct intel_device_info i915gm_info = {  static
> const struct intel_device_info i945g_info = {
>  	GEN3_FEATURES,
>  	PLATFORM(INTEL_I945G),
> +	I845_COLORS,
>  	.display.has_hotplug = 1,
>  	.display.cursor_needs_physical = 1,
>  	.display.has_overlay = 1,
> @@ -292,6 +294,7 @@ static const struct intel_device_info i945g_info = {  static
> const struct intel_device_info i945gm_info = {
>  	GEN3_FEATURES,
>  	PLATFORM(INTEL_I945GM),
> +	I9XX_COLORS,
>  	.is_mobile = 1,
>  	.display.has_hotplug = 1,
>  	.display.cursor_needs_physical = 1,
> @@ -306,6 +309,7 @@ static const struct intel_device_info i945gm_info = {  static
> const struct intel_device_info g33_info = {
>  	GEN3_FEATURES,
>  	PLATFORM(INTEL_G33),
> +	I845_COLORS,
>  	.display.has_hotplug = 1,
>  	.display.has_overlay = 1,
>  	.dma_mask_size = 36,
> @@ -314,6 +318,7 @@ static const struct intel_device_info g33_info = {  static
> const struct intel_device_info pnv_g_info = {
>  	GEN3_FEATURES,
>  	PLATFORM(INTEL_PINEVIEW),
> +	I9XX_COLORS,
>  	.display.has_hotplug = 1,
>  	.display.has_overlay = 1,
>  	.dma_mask_size = 36,
> @@ -322,6 +327,7 @@ static const struct intel_device_info pnv_g_info = {  static
> const struct intel_device_info pnv_m_info = {
>  	GEN3_FEATURES,
>  	PLATFORM(INTEL_PINEVIEW),
> +	I9XX_COLORS,
>  	.is_mobile = 1,
>  	.display.has_hotplug = 1,
>  	.display.has_overlay = 1,
> --
> 2.39.2

Jani Nikula May 26, 2023, 10:59 a.m. UTC | #2

On Thu, 25 May 2023, "Shankar, Uma" <uma.shankar@intel.com> wrote:
>> -----Original Message-----
>> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Ville Syrjala
>> Sent: Thursday, April 13, 2023 10:19 PM
>> To: intel-gfx@lists.freedesktop.org
>> Cc: dri-devel@lists.freedesktop.org
>> Subject: [Intel-gfx] [PATCH v2 6/7] drm/i915: No 10bit gamma on desktop gen3 parts
>> 
>> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>> 
>> Apparently desktop gen3 parts don't support the 10bit gamma mode at all. Stop
>> claiming otherwise.
>> 
>> As is the case with pipe A on gen3 mobile parts, the PIPECONF gamma mode bit can
>> be set but it has no effect on the output.
>> 
>> PNV seems to be the only slight exception, but generally the desktop PNV variant
>> looks more like a mobile part so this is not entirely surprising.
>
> Couldn't check the relevant spec to re-confirm, trusting your judgment here.
> Reviewed-by: Uma Shankar <uma.shankar@intel.com>

This needs a rebase on display/intel_display_device.[ch] stuff.

BR,
Jani.


>
>> Fixes: 67630bacae23 ("drm/i915: Add 10bit gamma mode for gen2/3")
>> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>> ---
>>  drivers/gpu/drm/i915/i915_pci.c | 8 +++++++-
>>  1 file changed, 7 insertions(+), 1 deletion(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index
>> cddb6e197972..305c05c3f93b 100644
>> --- a/drivers/gpu/drm/i915/i915_pci.c
>> +++ b/drivers/gpu/drm/i915/i915_pci.c
>> @@ -250,13 +250,13 @@ static const struct intel_device_info i865g_info = {
>>  	.dma_mask_size = 32, \
>>  	I9XX_PIPE_OFFSETS, \
>>  	I9XX_CURSOR_OFFSETS, \
>> -	I9XX_COLORS, \
>>  	GEN_DEFAULT_PAGE_SIZES, \
>>  	GEN_DEFAULT_REGIONS
>> 
>>  static const struct intel_device_info i915g_info = {
>>  	GEN3_FEATURES,
>>  	PLATFORM(INTEL_I915G),
>> +	I845_COLORS,
>>  	.has_coherent_ggtt = false,
>>  	.display.cursor_needs_physical = 1,
>>  	.display.has_overlay = 1,
>> @@ -268,6 +268,7 @@ static const struct intel_device_info i915g_info = {  static
>> const struct intel_device_info i915gm_info = {
>>  	GEN3_FEATURES,
>>  	PLATFORM(INTEL_I915GM),
>> +	I9XX_COLORS,
>>  	.is_mobile = 1,
>>  	.display.cursor_needs_physical = 1,
>>  	.display.has_overlay = 1,
>> @@ -281,6 +282,7 @@ static const struct intel_device_info i915gm_info = {  static
>> const struct intel_device_info i945g_info = {
>>  	GEN3_FEATURES,
>>  	PLATFORM(INTEL_I945G),
>> +	I845_COLORS,
>>  	.display.has_hotplug = 1,
>>  	.display.cursor_needs_physical = 1,
>>  	.display.has_overlay = 1,
>> @@ -292,6 +294,7 @@ static const struct intel_device_info i945g_info = {  static
>> const struct intel_device_info i945gm_info = {
>>  	GEN3_FEATURES,
>>  	PLATFORM(INTEL_I945GM),
>> +	I9XX_COLORS,
>>  	.is_mobile = 1,
>>  	.display.has_hotplug = 1,
>>  	.display.cursor_needs_physical = 1,
>> @@ -306,6 +309,7 @@ static const struct intel_device_info i945gm_info = {  static
>> const struct intel_device_info g33_info = {
>>  	GEN3_FEATURES,
>>  	PLATFORM(INTEL_G33),
>> +	I845_COLORS,
>>  	.display.has_hotplug = 1,
>>  	.display.has_overlay = 1,
>>  	.dma_mask_size = 36,
>> @@ -314,6 +318,7 @@ static const struct intel_device_info g33_info = {  static
>> const struct intel_device_info pnv_g_info = {
>>  	GEN3_FEATURES,
>>  	PLATFORM(INTEL_PINEVIEW),
>> +	I9XX_COLORS,
>>  	.display.has_hotplug = 1,
>>  	.display.has_overlay = 1,
>>  	.dma_mask_size = 36,
>> @@ -322,6 +327,7 @@ static const struct intel_device_info pnv_g_info = {  static
>> const struct intel_device_info pnv_m_info = {
>>  	GEN3_FEATURES,
>>  	PLATFORM(INTEL_PINEVIEW),
>> +	I9XX_COLORS,
>>  	.is_mobile = 1,
>>  	.display.has_hotplug = 1,
>>  	.display.has_overlay = 1,
>> --
>> 2.39.2
>

Ville Syrjälä May 26, 2023, 1:51 p.m. UTC | #3

On Thu, May 25, 2023 at 09:25:46PM +0000, Shankar, Uma wrote:
> 
> 
> > -----Original Message-----
> > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Ville Syrjala
> > Sent: Thursday, April 13, 2023 10:19 PM
> > To: intel-gfx@lists.freedesktop.org
> > Cc: dri-devel@lists.freedesktop.org
> > Subject: [Intel-gfx] [PATCH v2 6/7] drm/i915: No 10bit gamma on desktop gen3 parts
> > 
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > Apparently desktop gen3 parts don't support the 10bit gamma mode at all. Stop
> > claiming otherwise.
> > 
> > As is the case with pipe A on gen3 mobile parts, the PIPECONF gamma mode bit can
> > be set but it has no effect on the output.
> > 
> > PNV seems to be the only slight exception, but generally the desktop PNV variant
> > looks more like a mobile part so this is not entirely surprising.
> 
> Couldn't check the relevant spec to re-confirm, trusting your judgment here.

The spec isn't helpful here actually. Real world testing on every
gen3 platform was needed to be sure how this works.

> Reviewed-by: Uma Shankar <uma.shankar@intel.com>

Thanks.

> 
> > Fixes: 67630bacae23 ("drm/i915: Add 10bit gamma mode for gen2/3")
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_pci.c | 8 +++++++-
> >  1 file changed, 7 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index
> > cddb6e197972..305c05c3f93b 100644
> > --- a/drivers/gpu/drm/i915/i915_pci.c
> > +++ b/drivers/gpu/drm/i915/i915_pci.c
> > @@ -250,13 +250,13 @@ static const struct intel_device_info i865g_info = {
> >  	.dma_mask_size = 32, \
> >  	I9XX_PIPE_OFFSETS, \
> >  	I9XX_CURSOR_OFFSETS, \
> > -	I9XX_COLORS, \
> >  	GEN_DEFAULT_PAGE_SIZES, \
> >  	GEN_DEFAULT_REGIONS
> > 
> >  static const struct intel_device_info i915g_info = {
> >  	GEN3_FEATURES,
> >  	PLATFORM(INTEL_I915G),
> > +	I845_COLORS,
> >  	.has_coherent_ggtt = false,
> >  	.display.cursor_needs_physical = 1,
> >  	.display.has_overlay = 1,
> > @@ -268,6 +268,7 @@ static const struct intel_device_info i915g_info = {  static
> > const struct intel_device_info i915gm_info = {
> >  	GEN3_FEATURES,
> >  	PLATFORM(INTEL_I915GM),
> > +	I9XX_COLORS,
> >  	.is_mobile = 1,
> >  	.display.cursor_needs_physical = 1,
> >  	.display.has_overlay = 1,
> > @@ -281,6 +282,7 @@ static const struct intel_device_info i915gm_info = {  static
> > const struct intel_device_info i945g_info = {
> >  	GEN3_FEATURES,
> >  	PLATFORM(INTEL_I945G),
> > +	I845_COLORS,
> >  	.display.has_hotplug = 1,
> >  	.display.cursor_needs_physical = 1,
> >  	.display.has_overlay = 1,
> > @@ -292,6 +294,7 @@ static const struct intel_device_info i945g_info = {  static
> > const struct intel_device_info i945gm_info = {
> >  	GEN3_FEATURES,
> >  	PLATFORM(INTEL_I945GM),
> > +	I9XX_COLORS,
> >  	.is_mobile = 1,
> >  	.display.has_hotplug = 1,
> >  	.display.cursor_needs_physical = 1,
> > @@ -306,6 +309,7 @@ static const struct intel_device_info i945gm_info = {  static
> > const struct intel_device_info g33_info = {
> >  	GEN3_FEATURES,
> >  	PLATFORM(INTEL_G33),
> > +	I845_COLORS,
> >  	.display.has_hotplug = 1,
> >  	.display.has_overlay = 1,
> >  	.dma_mask_size = 36,
> > @@ -314,6 +318,7 @@ static const struct intel_device_info g33_info = {  static
> > const struct intel_device_info pnv_g_info = {
> >  	GEN3_FEATURES,
> >  	PLATFORM(INTEL_PINEVIEW),
> > +	I9XX_COLORS,
> >  	.display.has_hotplug = 1,
> >  	.display.has_overlay = 1,
> >  	.dma_mask_size = 36,
> > @@ -322,6 +327,7 @@ static const struct intel_device_info pnv_g_info = {  static
> > const struct intel_device_info pnv_m_info = {
> >  	GEN3_FEATURES,
> >  	PLATFORM(INTEL_PINEVIEW),
> > +	I9XX_COLORS,
> >  	.is_mobile = 1,
> >  	.display.has_hotplug = 1,
> >  	.display.has_overlay = 1,
> > --
> > 2.39.2
>

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index cddb6e197972..305c05c3f93b 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -250,13 +250,13 @@  static const struct intel_device_info i865g_info = {
 	.dma_mask_size = 32, \
 	I9XX_PIPE_OFFSETS, \
 	I9XX_CURSOR_OFFSETS, \
-	I9XX_COLORS, \
 	GEN_DEFAULT_PAGE_SIZES, \
 	GEN_DEFAULT_REGIONS
 
 static const struct intel_device_info i915g_info = {
 	GEN3_FEATURES,
 	PLATFORM(INTEL_I915G),
+	I845_COLORS,
 	.has_coherent_ggtt = false,
 	.display.cursor_needs_physical = 1,
 	.display.has_overlay = 1,
@@ -268,6 +268,7 @@  static const struct intel_device_info i915g_info = {
 static const struct intel_device_info i915gm_info = {
 	GEN3_FEATURES,
 	PLATFORM(INTEL_I915GM),
+	I9XX_COLORS,
 	.is_mobile = 1,
 	.display.cursor_needs_physical = 1,
 	.display.has_overlay = 1,
@@ -281,6 +282,7 @@  static const struct intel_device_info i915gm_info = {
 static const struct intel_device_info i945g_info = {
 	GEN3_FEATURES,
 	PLATFORM(INTEL_I945G),
+	I845_COLORS,
 	.display.has_hotplug = 1,
 	.display.cursor_needs_physical = 1,
 	.display.has_overlay = 1,
@@ -292,6 +294,7 @@  static const struct intel_device_info i945g_info = {
 static const struct intel_device_info i945gm_info = {
 	GEN3_FEATURES,
 	PLATFORM(INTEL_I945GM),
+	I9XX_COLORS,
 	.is_mobile = 1,
 	.display.has_hotplug = 1,
 	.display.cursor_needs_physical = 1,
@@ -306,6 +309,7 @@  static const struct intel_device_info i945gm_info = {
 static const struct intel_device_info g33_info = {
 	GEN3_FEATURES,
 	PLATFORM(INTEL_G33),
+	I845_COLORS,
 	.display.has_hotplug = 1,
 	.display.has_overlay = 1,
 	.dma_mask_size = 36,
@@ -314,6 +318,7 @@  static const struct intel_device_info g33_info = {
 static const struct intel_device_info pnv_g_info = {
 	GEN3_FEATURES,
 	PLATFORM(INTEL_PINEVIEW),
+	I9XX_COLORS,
 	.display.has_hotplug = 1,
 	.display.has_overlay = 1,
 	.dma_mask_size = 36,
@@ -322,6 +327,7 @@  static const struct intel_device_info pnv_g_info = {
 static const struct intel_device_info pnv_m_info = {
 	GEN3_FEATURES,
 	PLATFORM(INTEL_PINEVIEW),
+	I9XX_COLORS,
 	.is_mobile = 1,
 	.display.has_hotplug = 1,
 	.display.has_overlay = 1,

[v2,6/7] drm/i915: No 10bit gamma on desktop gen3 parts

Commit Message

Comments

Patch