diff mbox

drm/edid: Reduce horizontal timings for pixel replicated modes

Message ID 1408483281-28053-1-git-send-email-clinton.a.taylor@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Taylor, Clinton A Aug. 19, 2014, 9:21 p.m. UTC 
From: Clint Taylor <clinton.a.taylor@intel.com>

Pixel replicated modes should be 720 horizontal pixel and pixel
replicated by the HW across the HDMI cable at 2X pixel clock. Current
horizontal resolution of 1440 does not allow pixel duplication to
occur and scaling artifacts occur on the TV. HDMI certification
7-26 currently fails for all pixel replicated modes. This change fizes
the HDMI certification issues with 480i/576i.

V2: Removed interlace flag from VICs 44 and 45. Will be submitted in
another patch. Various other formatting fixes.

V3: 576i@200 htotal fixed. Check min and max pixel clocks.

Signed-off-by: Clint Taylor <clinton.a.taylor@intel.com>
---
 drivers/gpu/drm/drm_edid.c        |   96 ++++++++++++++++++-------------------
 drivers/gpu/drm/i915/intel_hdmi.c |   15 ++++--
 2 files changed, 60 insertions(+), 51 deletions(-)

Comments

Daniel Vetter Aug. 26, 2014, 8:10 a.m. UTC | #1 
On Tue, Aug 19, 2014 at 02:21:21PM -0700, clinton.a.taylor@intel.com wrote:
> From: Clint Taylor <clinton.a.taylor@intel.com>
> 
> Pixel replicated modes should be 720 horizontal pixel and pixel
> replicated by the HW across the HDMI cable at 2X pixel clock. Current
> horizontal resolution of 1440 does not allow pixel duplication to
> occur and scaling artifacts occur on the TV. HDMI certification
> 7-26 currently fails for all pixel replicated modes. This change fizes
> the HDMI certification issues with 480i/576i.
> 
> V2: Removed interlace flag from VICs 44 and 45. Will be submitted in
> another patch. Various other formatting fixes.
> 
> V3: 576i@200 htotal fixed. Check min and max pixel clocks.
> 
> Signed-off-by: Clint Taylor <clinton.a.taylor@intel.com>
> ---
>  drivers/gpu/drm/drm_edid.c        |   96 ++++++++++++++++++-------------------
>  drivers/gpu/drm/i915/intel_hdmi.c |   15 ++++--

Still plea to split out the i915 change.

Thanks, Daniel

>  2 files changed, 60 insertions(+), 51 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index f905c63..dc25999 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -632,27 +632,27 @@ static const struct drm_display_mode edid_cea_modes[] = {
>  		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |
>  			DRM_MODE_FLAG_INTERLACE),
>  	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> -	/* 6 - 1440x480i@60Hz */
> -	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,
> -		   1602, 1716, 0, 480, 488, 494, 525, 0,
> +	/* 6 - 720(1440)x480i@60Hz */
> +	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 13500, 720, 739,
> +		   801, 858, 0, 480, 488, 494, 525, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
> -	/* 7 - 1440x480i@60Hz */
> -	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,
> -		   1602, 1716, 0, 480, 488, 494, 525, 0,
> +	/* 7 - 720(1440)x480i@60Hz */
> +	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 13500, 720, 739,
> +		   801, 858, 0, 480, 488, 494, 525, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> -	/* 8 - 1440x240@60Hz */
> -	{ DRM_MODE("1440x240", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,
> -		   1602, 1716, 0, 240, 244, 247, 262, 0,
> +	/* 8 - 720(1440)x240@60Hz */
> +	{ DRM_MODE("720x240", DRM_MODE_TYPE_DRIVER, 13500, 720, 739,
> +		   801, 858, 0, 240, 244, 247, 262, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
> -	/* 9 - 1440x240@60Hz */
> -	{ DRM_MODE("1440x240", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,
> -		   1602, 1716, 0, 240, 244, 247, 262, 0,
> +	/* 9 - 720(1440)x240@60Hz */
> +	{ DRM_MODE("720x240", DRM_MODE_TYPE_DRIVER, 13500, 720, 739,
> +		   801, 858, 0, 240, 244, 247, 262, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> @@ -714,27 +714,27 @@ static const struct drm_display_mode edid_cea_modes[] = {
>  		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |
>  			DRM_MODE_FLAG_INTERLACE),
>  	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> -	/* 21 - 1440x576i@50Hz */
> -	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,
> -		   1590, 1728, 0, 576, 580, 586, 625, 0,
> +	/* 21 - 720(1440)x576i@50Hz */
> +	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 13500, 720, 732,
> +		   795, 864, 0, 576, 580, 586, 625, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
> -	/* 22 - 1440x576i@50Hz */
> -	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,
> -		   1590, 1728, 0, 576, 580, 586, 625, 0,
> +	/* 22 - 720(1440)x576i@50Hz */
> +	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 13500, 720, 732,
> +		   795, 864, 0, 576, 580, 586, 625, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> -	/* 23 - 1440x288@50Hz */
> -	{ DRM_MODE("1440x288", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,
> -		   1590, 1728, 0, 288, 290, 293, 312, 0,
> +	/* 23 - 720(1440)x288@50Hz */
> +	{ DRM_MODE("720x288", DRM_MODE_TYPE_DRIVER, 13500, 720, 732,
> +		   795, 864, 0, 288, 290, 293, 312, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
> -	/* 24 - 1440x288@50Hz */
> -	{ DRM_MODE("1440x288", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,
> -		   1590, 1728, 0, 288, 290, 293, 312, 0,
> +	/* 24 - 720(1440)x288@50Hz */
> +	{ DRM_MODE("720x288", DRM_MODE_TYPE_DRIVER, 13500, 720, 732,
> +		   795, 864, 0, 288, 290, 293, 312, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> @@ -837,15 +837,15 @@ static const struct drm_display_mode edid_cea_modes[] = {
>  		   796, 864, 0, 576, 581, 586, 625, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC),
>  	  .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> -	/* 44 - 1440x576i@100Hz */
> -	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464,
> -		   1590, 1728, 0, 576, 580, 586, 625, 0,
> +	/* 44 - 720(1440)x576i@100Hz */
> +	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 27000, 720, 732,
> +		   795, 864, 0, 576, 580, 586, 625, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
> -	/* 45 - 1440x576i@100Hz */
> -	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464,
> -		   1590, 1728, 0, 576, 580, 586, 625, 0,
> +	/* 45 - 720(1440)x576i@100Hz */
> +	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 27000, 720, 732,
> +		   795, 864, 0, 576, 580, 586, 625, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> @@ -870,15 +870,15 @@ static const struct drm_display_mode edid_cea_modes[] = {
>  		   798, 858, 0, 480, 489, 495, 525, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC),
>  	  .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> -	/* 50 - 1440x480i@120Hz */
> -	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1478,
> -		   1602, 1716, 0, 480, 488, 494, 525, 0,
> +	/* 50 - 720(1440)x480i@120Hz */
> +	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 27000, 720, 739,
> +		   801, 858, 0, 480, 488, 494, 525, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
> -	/* 51 - 1440x480i@120Hz */
> -	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1478,
> -		   1602, 1716, 0, 480, 488, 494, 525, 0,
> +	/* 51 - 720(1440)x480i@120Hz */
> +	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 27000, 720, 739,
> +		   801, 858, 0, 480, 488, 494, 525, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> @@ -892,15 +892,15 @@ static const struct drm_display_mode edid_cea_modes[] = {
>  		   796, 864, 0, 576, 581, 586, 625, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC),
>  	  .vrefresh = 200, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> -	/* 54 - 1440x576i@200Hz */
> -	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1464,
> -		   1590, 1728, 0, 576, 580, 586, 625, 0,
> +	/* 54 - 720(1440)x576i@200Hz */
> +	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 54000, 720, 732,
> +		   795, 864, 0, 576, 580, 586, 625, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 200, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
> -	/* 55 - 1440x576i@200Hz */
> -	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1464,
> -		   1590, 1728, 0, 576, 580, 586, 625, 0,
> +	/* 55 - 720(1440)x576i@200Hz */
> +	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 54000, 720, 732,
> +		   795, 864, 0, 576, 580, 586, 625, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 200, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> @@ -914,15 +914,15 @@ static const struct drm_display_mode edid_cea_modes[] = {
>  		   798, 858, 0, 480, 489, 495, 525, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC),
>  	  .vrefresh = 240, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> -	/* 58 - 1440x480i@240 */
> -	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1478,
> -		   1602, 1716, 0, 480, 488, 494, 525, 0,
> +	/* 58 - 720(1440)x480i@240 */
> +	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 54000, 720, 739,
> +		   801, 858, 0, 480, 488, 494, 525, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 240, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
> -	/* 59 - 1440x480i@240 */
> -	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1478,
> -		   1602, 1716, 0, 480, 488, 494, 525, 0,
> +	/* 59 - 720(1440)x480i@240 */
> +	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 54000, 720, 739,
> +		   801, 858, 0, 480, 488, 494, 525, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 240, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 9169786..9695768 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -864,10 +864,15 @@ static enum drm_mode_status
>  intel_hdmi_mode_valid(struct drm_connector *connector,
>  		      struct drm_display_mode *mode)
>  {
> -	if (mode->clock > hdmi_portclock_limit(intel_attached_hdmi(connector),
> -					       true))
> +	int clock = mode->clock;
> +
> +	if (mode->flags & DRM_MODE_FLAG_DBLCLK)
> +		clock *= 2;
> +
> +	if (clock > hdmi_portclock_limit(intel_attached_hdmi(connector),
> +					 true))
>  		return MODE_CLOCK_HIGH;
> -	if (mode->clock < 20000)
> +	if (clock < 20000)
>  		return MODE_CLOCK_LOW;
>  
>  	if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
> @@ -921,6 +926,10 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
>  			intel_hdmi->color_range = 0;
>  	}
>  
> +	if (adjusted_mode->flags & DRM_MODE_FLAG_DBLCLK) {
> +		pipe_config->pixel_multiplier = 2;
> +	}
> +
>  	if (intel_hdmi->color_range)
>  		pipe_config->limited_color_range = true;
>  
> -- 
> 1.7.9.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter Aug. 26, 2014, 8:11 a.m. UTC | #2 
On Tue, Aug 26, 2014 at 10:10:09AM +0200, Daniel Vetter wrote:
> On Tue, Aug 19, 2014 at 02:21:21PM -0700, clinton.a.taylor@intel.com wrote:
> > From: Clint Taylor <clinton.a.taylor@intel.com>
> > 
> > Pixel replicated modes should be 720 horizontal pixel and pixel
> > replicated by the HW across the HDMI cable at 2X pixel clock. Current
> > horizontal resolution of 1440 does not allow pixel duplication to
> > occur and scaling artifacts occur on the TV. HDMI certification
> > 7-26 currently fails for all pixel replicated modes. This change fizes
> > the HDMI certification issues with 480i/576i.
> > 
> > V2: Removed interlace flag from VICs 44 and 45. Will be submitted in
> > another patch. Various other formatting fixes.
> > 
> > V3: 576i@200 htotal fixed. Check min and max pixel clocks.
> > 
> > Signed-off-by: Clint Taylor <clinton.a.taylor@intel.com>
> > ---
> >  drivers/gpu/drm/drm_edid.c        |   96 ++++++++++++++++++-------------------
> >  drivers/gpu/drm/i915/intel_hdmi.c |   15 ++++--
> 
> Still plea to split out the i915 change.

Also it's good practice to add all the people who commented on earlier
versions of this patch to the in-patch Cc: list. So Ville should be here
for this one.
-Daniel
Ville Syrjälä Sept. 1, 2014, 1:12 p.m. UTC | #3 
On Tue, Aug 26, 2014 at 10:11:07AM +0200, Daniel Vetter wrote:
> On Tue, Aug 26, 2014 at 10:10:09AM +0200, Daniel Vetter wrote:
> > On Tue, Aug 19, 2014 at 02:21:21PM -0700, clinton.a.taylor@intel.com wrote:
> > > From: Clint Taylor <clinton.a.taylor@intel.com>
> > > 
> > > Pixel replicated modes should be 720 horizontal pixel and pixel
> > > replicated by the HW across the HDMI cable at 2X pixel clock. Current
> > > horizontal resolution of 1440 does not allow pixel duplication to
> > > occur and scaling artifacts occur on the TV. HDMI certification
> > > 7-26 currently fails for all pixel replicated modes. This change fizes
> > > the HDMI certification issues with 480i/576i.
> > > 
> > > V2: Removed interlace flag from VICs 44 and 45. Will be submitted in
> > > another patch. Various other formatting fixes.
> > > 
> > > V3: 576i@200 htotal fixed. Check min and max pixel clocks.
> > > 
> > > Signed-off-by: Clint Taylor <clinton.a.taylor@intel.com>
> > > ---
> > >  drivers/gpu/drm/drm_edid.c        |   96 ++++++++++++++++++-------------------
> > >  drivers/gpu/drm/i915/intel_hdmi.c |   15 ++++--
> > 
> > Still plea to split out the i915 change.
> 
> Also it's good practice to add all the people who commented on earlier
> versions of this patch to the in-patch Cc: list. So Ville should be here
> for this one.

Also I've totally lost track of these now. Please use --in-reply-to
when sending revised patches.
Ville Syrjälä Sept. 1, 2014, 1:17 p.m. UTC | #4 
On Mon, Sep 01, 2014 at 04:12:27PM +0300, Ville Syrjälä wrote:
> On Tue, Aug 26, 2014 at 10:11:07AM +0200, Daniel Vetter wrote:
> > On Tue, Aug 26, 2014 at 10:10:09AM +0200, Daniel Vetter wrote:
> > > On Tue, Aug 19, 2014 at 02:21:21PM -0700, clinton.a.taylor@intel.com wrote:
> > > > From: Clint Taylor <clinton.a.taylor@intel.com>
> > > > 
> > > > Pixel replicated modes should be 720 horizontal pixel and pixel
> > > > replicated by the HW across the HDMI cable at 2X pixel clock. Current
> > > > horizontal resolution of 1440 does not allow pixel duplication to
> > > > occur and scaling artifacts occur on the TV. HDMI certification
> > > > 7-26 currently fails for all pixel replicated modes. This change fizes
> > > > the HDMI certification issues with 480i/576i.
> > > > 
> > > > V2: Removed interlace flag from VICs 44 and 45. Will be submitted in
> > > > another patch. Various other formatting fixes.
> > > > 
> > > > V3: 576i@200 htotal fixed. Check min and max pixel clocks.
> > > > 
> > > > Signed-off-by: Clint Taylor <clinton.a.taylor@intel.com>
> > > > ---
> > > >  drivers/gpu/drm/drm_edid.c        |   96 ++++++++++++++++++-------------------
> > > >  drivers/gpu/drm/i915/intel_hdmi.c |   15 ++++--
> > > 
> > > Still plea to split out the i915 change.
> > 
> > Also it's good practice to add all the people who commented on earlier
> > versions of this patch to the in-patch Cc: list. So Ville should be here
> > for this one.
> 
> Also I've totally lost track of these now. Please use --in-reply-to
> when sending revised patches.

Oh and please use --to --cc etc. also instead of sending the same patch
separately to multiple lists.
Ville Syrjälä Sept. 1, 2014, 1:19 p.m. UTC | #5 
On Tue, Aug 19, 2014 at 02:21:21PM -0700, clinton.a.taylor@intel.com wrote:
> From: Clint Taylor <clinton.a.taylor@intel.com>
> 
> Pixel replicated modes should be 720 horizontal pixel and pixel
> replicated by the HW across the HDMI cable at 2X pixel clock. Current
> horizontal resolution of 1440 does not allow pixel duplication to
> occur and scaling artifacts occur on the TV. HDMI certification
> 7-26 currently fails for all pixel replicated modes. This change fizes
> the HDMI certification issues with 480i/576i.
> 
> V2: Removed interlace flag from VICs 44 and 45. Will be submitted in
> another patch. Various other formatting fixes.
> 
> V3: 576i@200 htotal fixed. Check min and max pixel clocks.
> 
> Signed-off-by: Clint Taylor <clinton.a.taylor@intel.com>

Assuming you split it up like Daniel wanted you can slap
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
onto both parts.

> ---
>  drivers/gpu/drm/drm_edid.c        |   96 ++++++++++++++++++-------------------
>  drivers/gpu/drm/i915/intel_hdmi.c |   15 ++++--
>  2 files changed, 60 insertions(+), 51 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index f905c63..dc25999 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -632,27 +632,27 @@ static const struct drm_display_mode edid_cea_modes[] = {
>  		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |
>  			DRM_MODE_FLAG_INTERLACE),
>  	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> -	/* 6 - 1440x480i@60Hz */
> -	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,
> -		   1602, 1716, 0, 480, 488, 494, 525, 0,
> +	/* 6 - 720(1440)x480i@60Hz */
> +	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 13500, 720, 739,
> +		   801, 858, 0, 480, 488, 494, 525, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
> -	/* 7 - 1440x480i@60Hz */
> -	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,
> -		   1602, 1716, 0, 480, 488, 494, 525, 0,
> +	/* 7 - 720(1440)x480i@60Hz */
> +	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 13500, 720, 739,
> +		   801, 858, 0, 480, 488, 494, 525, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> -	/* 8 - 1440x240@60Hz */
> -	{ DRM_MODE("1440x240", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,
> -		   1602, 1716, 0, 240, 244, 247, 262, 0,
> +	/* 8 - 720(1440)x240@60Hz */
> +	{ DRM_MODE("720x240", DRM_MODE_TYPE_DRIVER, 13500, 720, 739,
> +		   801, 858, 0, 240, 244, 247, 262, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
> -	/* 9 - 1440x240@60Hz */
> -	{ DRM_MODE("1440x240", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,
> -		   1602, 1716, 0, 240, 244, 247, 262, 0,
> +	/* 9 - 720(1440)x240@60Hz */
> +	{ DRM_MODE("720x240", DRM_MODE_TYPE_DRIVER, 13500, 720, 739,
> +		   801, 858, 0, 240, 244, 247, 262, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> @@ -714,27 +714,27 @@ static const struct drm_display_mode edid_cea_modes[] = {
>  		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |
>  			DRM_MODE_FLAG_INTERLACE),
>  	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> -	/* 21 - 1440x576i@50Hz */
> -	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,
> -		   1590, 1728, 0, 576, 580, 586, 625, 0,
> +	/* 21 - 720(1440)x576i@50Hz */
> +	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 13500, 720, 732,
> +		   795, 864, 0, 576, 580, 586, 625, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
> -	/* 22 - 1440x576i@50Hz */
> -	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,
> -		   1590, 1728, 0, 576, 580, 586, 625, 0,
> +	/* 22 - 720(1440)x576i@50Hz */
> +	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 13500, 720, 732,
> +		   795, 864, 0, 576, 580, 586, 625, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> -	/* 23 - 1440x288@50Hz */
> -	{ DRM_MODE("1440x288", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,
> -		   1590, 1728, 0, 288, 290, 293, 312, 0,
> +	/* 23 - 720(1440)x288@50Hz */
> +	{ DRM_MODE("720x288", DRM_MODE_TYPE_DRIVER, 13500, 720, 732,
> +		   795, 864, 0, 288, 290, 293, 312, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
> -	/* 24 - 1440x288@50Hz */
> -	{ DRM_MODE("1440x288", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,
> -		   1590, 1728, 0, 288, 290, 293, 312, 0,
> +	/* 24 - 720(1440)x288@50Hz */
> +	{ DRM_MODE("720x288", DRM_MODE_TYPE_DRIVER, 13500, 720, 732,
> +		   795, 864, 0, 288, 290, 293, 312, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> @@ -837,15 +837,15 @@ static const struct drm_display_mode edid_cea_modes[] = {
>  		   796, 864, 0, 576, 581, 586, 625, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC),
>  	  .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> -	/* 44 - 1440x576i@100Hz */
> -	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464,
> -		   1590, 1728, 0, 576, 580, 586, 625, 0,
> +	/* 44 - 720(1440)x576i@100Hz */
> +	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 27000, 720, 732,
> +		   795, 864, 0, 576, 580, 586, 625, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
> -	/* 45 - 1440x576i@100Hz */
> -	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464,
> -		   1590, 1728, 0, 576, 580, 586, 625, 0,
> +	/* 45 - 720(1440)x576i@100Hz */
> +	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 27000, 720, 732,
> +		   795, 864, 0, 576, 580, 586, 625, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> @@ -870,15 +870,15 @@ static const struct drm_display_mode edid_cea_modes[] = {
>  		   798, 858, 0, 480, 489, 495, 525, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC),
>  	  .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> -	/* 50 - 1440x480i@120Hz */
> -	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1478,
> -		   1602, 1716, 0, 480, 488, 494, 525, 0,
> +	/* 50 - 720(1440)x480i@120Hz */
> +	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 27000, 720, 739,
> +		   801, 858, 0, 480, 488, 494, 525, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
> -	/* 51 - 1440x480i@120Hz */
> -	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1478,
> -		   1602, 1716, 0, 480, 488, 494, 525, 0,
> +	/* 51 - 720(1440)x480i@120Hz */
> +	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 27000, 720, 739,
> +		   801, 858, 0, 480, 488, 494, 525, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> @@ -892,15 +892,15 @@ static const struct drm_display_mode edid_cea_modes[] = {
>  		   796, 864, 0, 576, 581, 586, 625, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC),
>  	  .vrefresh = 200, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> -	/* 54 - 1440x576i@200Hz */
> -	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1464,
> -		   1590, 1728, 0, 576, 580, 586, 625, 0,
> +	/* 54 - 720(1440)x576i@200Hz */
> +	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 54000, 720, 732,
> +		   795, 864, 0, 576, 580, 586, 625, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 200, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
> -	/* 55 - 1440x576i@200Hz */
> -	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1464,
> -		   1590, 1728, 0, 576, 580, 586, 625, 0,
> +	/* 55 - 720(1440)x576i@200Hz */
> +	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 54000, 720, 732,
> +		   795, 864, 0, 576, 580, 586, 625, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 200, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> @@ -914,15 +914,15 @@ static const struct drm_display_mode edid_cea_modes[] = {
>  		   798, 858, 0, 480, 489, 495, 525, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC),
>  	  .vrefresh = 240, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> -	/* 58 - 1440x480i@240 */
> -	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1478,
> -		   1602, 1716, 0, 480, 488, 494, 525, 0,
> +	/* 58 - 720(1440)x480i@240 */
> +	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 54000, 720, 739,
> +		   801, 858, 0, 480, 488, 494, 525, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 240, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
> -	/* 59 - 1440x480i@240 */
> -	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1478,
> -		   1602, 1716, 0, 480, 488, 494, 525, 0,
> +	/* 59 - 720(1440)x480i@240 */
> +	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 54000, 720, 739,
> +		   801, 858, 0, 480, 488, 494, 525, 0,
>  		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
>  			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
>  	  .vrefresh = 240, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 9169786..9695768 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -864,10 +864,15 @@ static enum drm_mode_status
>  intel_hdmi_mode_valid(struct drm_connector *connector,
>  		      struct drm_display_mode *mode)
>  {
> -	if (mode->clock > hdmi_portclock_limit(intel_attached_hdmi(connector),
> -					       true))
> +	int clock = mode->clock;
> +
> +	if (mode->flags & DRM_MODE_FLAG_DBLCLK)
> +		clock *= 2;
> +
> +	if (clock > hdmi_portclock_limit(intel_attached_hdmi(connector),
> +					 true))
>  		return MODE_CLOCK_HIGH;
> -	if (mode->clock < 20000)
> +	if (clock < 20000)
>  		return MODE_CLOCK_LOW;
>  
>  	if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
> @@ -921,6 +926,10 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
>  			intel_hdmi->color_range = 0;
>  	}
>  
> +	if (adjusted_mode->flags & DRM_MODE_FLAG_DBLCLK) {
> +		pipe_config->pixel_multiplier = 2;
> +	}
> +
>  	if (intel_hdmi->color_range)
>  		pipe_config->limited_color_range = true;
>  
> -- 
> 1.7.9.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter Sept. 4, 2014, 6:31 p.m. UTC | #6 
Readding intel-gfx since this is interesting for everyone.

On Thu, Sep 4, 2014 at 8:09 PM, Clint Taylor <clinton.a.taylor@intel.com> wrote:
> I will attempt to improve my patch submissions process. I also need to start
> annotating version in the subject field as well.
>
> When using --in_reply_to=  do I just use the Message-ID: from the original
> patch message header or do I use the Message-ID: from the reply asking for
> the change?

Usually I reply to the previous patch version to avoid threads nesting
too badly, but other people reply to the last review comment. It
doesn't really matter.

More important is to Cc: all the people (in the commit message to make
sure it doesn't get lost, git send-email then takes care of
everything) who commented on that patch so that they'll see your
updated version.

> Sorry for the newbie questions, I'm coming over from the embedded world.

Not at all, this just means our documentation isn't good enough yet.

Cheers, Daniel
Jani Nikula Sept. 5, 2014, 7:03 a.m. UTC | #7 
On Thu, 04 Sep 2014, Daniel Vetter <daniel@ffwll.ch> wrote:
> More important is to Cc: all the people (in the commit message to make
> sure it doesn't get lost, git send-email then takes care of
> everything) who commented on that patch so that they'll see your
> updated version.

git send-email taking care of everything is subject to
sendemail.suppresscc and other configuration values. With the git
defaults, you need to be careful not to accidentally Cc people,
typically when sending a patch privately/internally.

BR,
Jani.
Ville Syrjälä Sept. 5, 2014, 8:08 a.m. UTC | #8 
On Thu, Sep 04, 2014 at 08:31:07PM +0200, Daniel Vetter wrote:
> Readding intel-gfx since this is interesting for everyone.
> 
> On Thu, Sep 4, 2014 at 8:09 PM, Clint Taylor <clinton.a.taylor@intel.com> wrote:
> > I will attempt to improve my patch submissions process. I also need to start
> > annotating version in the subject field as well.
> >
> > When using --in_reply_to=  do I just use the Message-ID: from the original
> > patch message header or do I use the Message-ID: from the reply asking for
> > the change?
> 
> Usually I reply to the previous patch version to avoid threads nesting
> too badly, but other people reply to the last review comment. It
> doesn't really matter.

I tend to do the latter, but I must admit the threads sometimes get
rather messy, so I think I'll change my ways. The changelog in the
patch should anyway keep the story together.
diff mbox

Patch

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index f905c63..dc25999 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -632,27 +632,27 @@  static const struct drm_display_mode edid_cea_modes[] = {
 		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |
 			DRM_MODE_FLAG_INTERLACE),
 	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
-	/* 6 - 1440x480i@60Hz */
-	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,
-		   1602, 1716, 0, 480, 488, 494, 525, 0,
+	/* 6 - 720(1440)x480i@60Hz */
+	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 13500, 720, 739,
+		   801, 858, 0, 480, 488, 494, 525, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
 			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
 	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
-	/* 7 - 1440x480i@60Hz */
-	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,
-		   1602, 1716, 0, 480, 488, 494, 525, 0,
+	/* 7 - 720(1440)x480i@60Hz */
+	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 13500, 720, 739,
+		   801, 858, 0, 480, 488, 494, 525, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
 			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
 	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
-	/* 8 - 1440x240@60Hz */
-	{ DRM_MODE("1440x240", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,
-		   1602, 1716, 0, 240, 244, 247, 262, 0,
+	/* 8 - 720(1440)x240@60Hz */
+	{ DRM_MODE("720x240", DRM_MODE_TYPE_DRIVER, 13500, 720, 739,
+		   801, 858, 0, 240, 244, 247, 262, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
 			DRM_MODE_FLAG_DBLCLK),
 	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
-	/* 9 - 1440x240@60Hz */
-	{ DRM_MODE("1440x240", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,
-		   1602, 1716, 0, 240, 244, 247, 262, 0,
+	/* 9 - 720(1440)x240@60Hz */
+	{ DRM_MODE("720x240", DRM_MODE_TYPE_DRIVER, 13500, 720, 739,
+		   801, 858, 0, 240, 244, 247, 262, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
 			DRM_MODE_FLAG_DBLCLK),
 	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
@@ -714,27 +714,27 @@  static const struct drm_display_mode edid_cea_modes[] = {
 		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |
 			DRM_MODE_FLAG_INTERLACE),
 	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
-	/* 21 - 1440x576i@50Hz */
-	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,
-		   1590, 1728, 0, 576, 580, 586, 625, 0,
+	/* 21 - 720(1440)x576i@50Hz */
+	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 13500, 720, 732,
+		   795, 864, 0, 576, 580, 586, 625, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
 			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
 	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
-	/* 22 - 1440x576i@50Hz */
-	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,
-		   1590, 1728, 0, 576, 580, 586, 625, 0,
+	/* 22 - 720(1440)x576i@50Hz */
+	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 13500, 720, 732,
+		   795, 864, 0, 576, 580, 586, 625, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
 			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
 	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
-	/* 23 - 1440x288@50Hz */
-	{ DRM_MODE("1440x288", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,
-		   1590, 1728, 0, 288, 290, 293, 312, 0,
+	/* 23 - 720(1440)x288@50Hz */
+	{ DRM_MODE("720x288", DRM_MODE_TYPE_DRIVER, 13500, 720, 732,
+		   795, 864, 0, 288, 290, 293, 312, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
 			DRM_MODE_FLAG_DBLCLK),
 	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
-	/* 24 - 1440x288@50Hz */
-	{ DRM_MODE("1440x288", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,
-		   1590, 1728, 0, 288, 290, 293, 312, 0,
+	/* 24 - 720(1440)x288@50Hz */
+	{ DRM_MODE("720x288", DRM_MODE_TYPE_DRIVER, 13500, 720, 732,
+		   795, 864, 0, 288, 290, 293, 312, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
 			DRM_MODE_FLAG_DBLCLK),
 	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
@@ -837,15 +837,15 @@  static const struct drm_display_mode edid_cea_modes[] = {
 		   796, 864, 0, 576, 581, 586, 625, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC),
 	  .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
-	/* 44 - 1440x576i@100Hz */
-	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464,
-		   1590, 1728, 0, 576, 580, 586, 625, 0,
+	/* 44 - 720(1440)x576i@100Hz */
+	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 27000, 720, 732,
+		   795, 864, 0, 576, 580, 586, 625, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
 			DRM_MODE_FLAG_DBLCLK),
 	  .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
-	/* 45 - 1440x576i@100Hz */
-	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464,
-		   1590, 1728, 0, 576, 580, 586, 625, 0,
+	/* 45 - 720(1440)x576i@100Hz */
+	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 27000, 720, 732,
+		   795, 864, 0, 576, 580, 586, 625, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
 			DRM_MODE_FLAG_DBLCLK),
 	  .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
@@ -870,15 +870,15 @@  static const struct drm_display_mode edid_cea_modes[] = {
 		   798, 858, 0, 480, 489, 495, 525, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC),
 	  .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
-	/* 50 - 1440x480i@120Hz */
-	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1478,
-		   1602, 1716, 0, 480, 488, 494, 525, 0,
+	/* 50 - 720(1440)x480i@120Hz */
+	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 27000, 720, 739,
+		   801, 858, 0, 480, 488, 494, 525, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
 			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
 	  .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
-	/* 51 - 1440x480i@120Hz */
-	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1478,
-		   1602, 1716, 0, 480, 488, 494, 525, 0,
+	/* 51 - 720(1440)x480i@120Hz */
+	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 27000, 720, 739,
+		   801, 858, 0, 480, 488, 494, 525, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
 			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
 	  .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
@@ -892,15 +892,15 @@  static const struct drm_display_mode edid_cea_modes[] = {
 		   796, 864, 0, 576, 581, 586, 625, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC),
 	  .vrefresh = 200, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
-	/* 54 - 1440x576i@200Hz */
-	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1464,
-		   1590, 1728, 0, 576, 580, 586, 625, 0,
+	/* 54 - 720(1440)x576i@200Hz */
+	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 54000, 720, 732,
+		   795, 864, 0, 576, 580, 586, 625, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
 			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
 	  .vrefresh = 200, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
-	/* 55 - 1440x576i@200Hz */
-	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1464,
-		   1590, 1728, 0, 576, 580, 586, 625, 0,
+	/* 55 - 720(1440)x576i@200Hz */
+	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 54000, 720, 732,
+		   795, 864, 0, 576, 580, 586, 625, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
 			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
 	  .vrefresh = 200, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
@@ -914,15 +914,15 @@  static const struct drm_display_mode edid_cea_modes[] = {
 		   798, 858, 0, 480, 489, 495, 525, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC),
 	  .vrefresh = 240, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
-	/* 58 - 1440x480i@240 */
-	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1478,
-		   1602, 1716, 0, 480, 488, 494, 525, 0,
+	/* 58 - 720(1440)x480i@240 */
+	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 54000, 720, 739,
+		   801, 858, 0, 480, 488, 494, 525, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
 			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
 	  .vrefresh = 240, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
-	/* 59 - 1440x480i@240 */
-	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1478,
-		   1602, 1716, 0, 480, 488, 494, 525, 0,
+	/* 59 - 720(1440)x480i@240 */
+	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 54000, 720, 739,
+		   801, 858, 0, 480, 488, 494, 525, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
 			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),
 	  .vrefresh = 240, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 9169786..9695768 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -864,10 +864,15 @@  static enum drm_mode_status
 intel_hdmi_mode_valid(struct drm_connector *connector,
 		      struct drm_display_mode *mode)
 {
-	if (mode->clock > hdmi_portclock_limit(intel_attached_hdmi(connector),
-					       true))
+	int clock = mode->clock;
+
+	if (mode->flags & DRM_MODE_FLAG_DBLCLK)
+		clock *= 2;
+
+	if (clock > hdmi_portclock_limit(intel_attached_hdmi(connector),
+					 true))
 		return MODE_CLOCK_HIGH;
-	if (mode->clock < 20000)
+	if (clock < 20000)
 		return MODE_CLOCK_LOW;
 
 	if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
@@ -921,6 +926,10 @@  bool intel_hdmi_compute_config(struct intel_encoder *encoder,
 			intel_hdmi->color_range = 0;
 	}
 
+	if (adjusted_mode->flags & DRM_MODE_FLAG_DBLCLK) {
+		pipe_config->pixel_multiplier = 2;
+	}
+
 	if (intel_hdmi->color_range)
 		pipe_config->limited_color_range = true;