drm/i915: add missing SDVO bits for interlaced modes on ILK
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): 20120210085936.76488e6b@jbarnes-desktop
PATCH 1/1 drm/i915: add missing SDVO bits for interlaced modes on ILK
From: Paulo Zanoni <[email protected]>
This was pointed by Jesse Barnes. The code now seems to follow the specification but I don't have an SDVO device to really test this.
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_display.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletions(-)
Did someone test interlaced modes with SDVO?
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -3365,6 +3365,7 @@#define TRANS_INTERLACE_MASK (7<<21)#define TRANS_PROGRESSIVE (0<<21)#define TRANS_INTERLACED (3<<21) +#define TRANS_LEGACY_INTERLACED_ILK (2<<21)#define TRANS_8BPC (0<<5)#define TRANS_10BPC (1<<5)#define TRANS_6BPC (2<<5)
drivers/gpu/drm/i915/intel_display.c +6 -1
@@ -1267,6 +1267,7 @@ static void intel_enable_transcoder(struct drm_i915_private *dev_priv, {int reg;u32 val, pipeconf_val; +struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];/* PCH only available on ILK+ */ BUG_ON (dev_priv->info->gen <5 );
@@ -1293,7 +1294,11 @@ static void intel_enable_transcoder(struct drm_i915_private *dev_priv, val &= ~TRANS_INTERLACE_MASK ;if ((pipeconf_val &PIPECONF_INTERLACE_MASK ) ==PIPECONF_INTERLACED_ILK ) - val |=TRANS_INTERLACED ; +if (HAS_PCH_IBX (dev_priv->dev) && +intel_pipe_has_type (crtc,INTEL_OUTPUT_SDVO )) + val |=TRANS_LEGACY_INTERLACED_ILK ; +else + val |=TRANS_INTERLACED ;else val |=TRANS_PROGRESSIVE ;
Signature · 1 line
1.7.9
Quoted 40 lines · On Tue, 14 Feb 2012 17:07:09 -0200 Paulo Zanoni <[email protected]> wrote:
From: Paulo Zanoni <[email protected]>
This was pointed by Jesse Barnes. The code now seems to follow the specification but I don't have an SDVO device to really test this.
Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_display.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletions(-)Did someone test interlaced modes with SDVO?
drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -3365,6 +3365,7 @@#define TRANS_INTERLACE_MASK (7<<21)#define TRANS_PROGRESSIVE (0<<21)#define TRANS_INTERLACED (3<<21) +#define TRANS_LEGACY_INTERLACED_ILK (2<<21)#define TRANS_8BPC (0<<5)#define TRANS_10BPC (1<<5)#define TRANS_6BPC (2<<5)drivers/gpu/drm/i915/intel_display.c +1
-0@@ -1267,6 +1267,7 @@ static void intel_enable_transcoder(struct drm_i915_private *dev_priv, {int reg;u32 val, pipeconf_val; +struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];/* PCH only available on ILK+ */ BUG_ON (dev_priv->info->gen <5 );@@ -1293,7 +1294,11 @@ static void intel_enable_transcoder(struct drm_i915_private *dev_priv, val &= ~TRANS_INTERLACE_MASK ;
drivers/gpu/drm/i915/intel_display.c static void intel_enable_transcoder(struct drm_i915_private *dev_priv, · line 1304
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +5
-1if ((pipeconf_val &PIPECONF_INTERLACE_MASK ) ==PIPECONF_INTERLACED_ILK ) - val |=TRANS_INTERLACED ; +if (HAS_PCH_IBX (dev_priv->dev) && +intel_pipe_has_type (crtc,INTEL_OUTPUT_SDVO )) + val |=TRANS_LEGACY_INTERLACED_ILK ; +else + val |=TRANS_INTERLACED ;else val |=TRANS_PROGRESSIVE ;
Yep, looks correct. Thanks Paulo.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 10 lines · Jesse Barnes
Quoted 6 lines · On Tue, 14 Feb 2012 17:07:09 -0200 Paulo Zanoni <[email protected]> wrote:
From: Paulo Zanoni <[email protected]>
This was pointed by Jesse Barnes. The code now seems to follow the specification but I don't have an SDVO device to really test this.
Signed-off-by Paulo Zanoni <[email protected]>Reviewed-by Jesse Barnes <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Signature · 3 lines
Daniel Vetter Mail: [email protected] Mobile: +41 (0)79 365 57 48