diff mbox

drm: Fix the CRTC_STEREO_DOUBLE_ONLY define to include stero modes

Message ID 1424099551-13252-1-git-send-email-damien.lespiau@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Lespiau, Damien Feb. 16, 2015, 3:12 p.m. UTC
The CRTC_STEREO_DOUBLE_ONLY define was introduced in commit:

  commit ecb7e16bf187bc369cf6a5cd108582c01329980d
  Author: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
  Date:   Mon Dec 1 15:40:09 2014 -0800

      drm: add helper to get crtc timings (v5)

but if we want the stereo h/v adjustments, we need to set the
CRTC_STEREO_DOUBLE flag. Otherwise, we'll get the wrong h/v for frame packing
stereo 3d modes.

Cc: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 include/drm/drm_modes.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Matt Roper Feb. 17, 2015, 6:05 p.m. UTC | #1
On Mon, Feb 16, 2015 at 03:12:31PM +0000, Damien Lespiau wrote:
> The CRTC_STEREO_DOUBLE_ONLY define was introduced in commit:
> 
>   commit ecb7e16bf187bc369cf6a5cd108582c01329980d
>   Author: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
>   Date:   Mon Dec 1 15:40:09 2014 -0800
> 
>       drm: add helper to get crtc timings (v5)
> 
> but if we want the stereo h/v adjustments, we need to set the
> CRTC_STEREO_DOUBLE flag. Otherwise, we'll get the wrong h/v for frame packing
> stereo 3d modes.
> 
> Cc: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> Cc: Matt Roper <matthew.d.roper@intel.com>
> Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>

> ---
>  include/drm/drm_modes.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h
> index d92f6dd..0616188 100644
> --- a/include/drm/drm_modes.h
> +++ b/include/drm/drm_modes.h
> @@ -92,7 +92,7 @@ enum drm_mode_status {
>  #define CRTC_STEREO_DOUBLE	(1 << 1) /* adjust timings for stereo modes */
>  #define CRTC_NO_DBLSCAN		(1 << 2) /* don't adjust doublescan */
>  #define CRTC_NO_VSCAN		(1 << 3) /* don't adjust doublescan */
> -#define CRTC_STEREO_DOUBLE_ONLY	(CRTC_NO_DBLSCAN | CRTC_NO_VSCAN)
> +#define CRTC_STEREO_DOUBLE_ONLY	(CRTC_STEREO_DOUBLE | CRTC_NO_DBLSCAN | CRTC_NO_VSCAN)
>  
>  #define DRM_MODE_FLAG_3D_MAX	DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF
>  
> -- 
> 1.8.3.1
>
Daniel Vetter Feb. 22, 2015, 11:56 a.m. UTC | #2
On Tue, Feb 17, 2015 at 10:05:27AM -0800, Matt Roper wrote:
> On Mon, Feb 16, 2015 at 03:12:31PM +0000, Damien Lespiau wrote:
> > The CRTC_STEREO_DOUBLE_ONLY define was introduced in commit:
> > 
> >   commit ecb7e16bf187bc369cf6a5cd108582c01329980d
> >   Author: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> >   Date:   Mon Dec 1 15:40:09 2014 -0800
> > 
> >       drm: add helper to get crtc timings (v5)
> > 
> > but if we want the stereo h/v adjustments, we need to set the
> > CRTC_STEREO_DOUBLE flag. Otherwise, we'll get the wrong h/v for frame packing
> > stereo 3d modes.
> > 
> > Cc: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> > Cc: Matt Roper <matthew.d.roper@intel.com>
> > Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> 
> Reviewed-by: Matt Roper <matthew.d.roper@intel.com>

Applied to drm-misc, thanks for patch&review. Yay for no-one using stereo
mode and yay for lack of igt :(
-Daniel
> 
> > ---
> >  include/drm/drm_modes.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h
> > index d92f6dd..0616188 100644
> > --- a/include/drm/drm_modes.h
> > +++ b/include/drm/drm_modes.h
> > @@ -92,7 +92,7 @@ enum drm_mode_status {
> >  #define CRTC_STEREO_DOUBLE	(1 << 1) /* adjust timings for stereo modes */
> >  #define CRTC_NO_DBLSCAN		(1 << 2) /* don't adjust doublescan */
> >  #define CRTC_NO_VSCAN		(1 << 3) /* don't adjust doublescan */
> > -#define CRTC_STEREO_DOUBLE_ONLY	(CRTC_NO_DBLSCAN | CRTC_NO_VSCAN)
> > +#define CRTC_STEREO_DOUBLE_ONLY	(CRTC_STEREO_DOUBLE | CRTC_NO_DBLSCAN | CRTC_NO_VSCAN)
> >  
> >  #define DRM_MODE_FLAG_3D_MAX	DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF
> >  
> > -- 
> > 1.8.3.1
> > 
> 
> -- 
> Matt Roper
> Graphics Software Engineer
> IoTG Platform Enabling & Development
> Intel Corporation
> (916) 356-2795
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff mbox

Patch

diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h
index d92f6dd..0616188 100644
--- a/include/drm/drm_modes.h
+++ b/include/drm/drm_modes.h
@@ -92,7 +92,7 @@  enum drm_mode_status {
 #define CRTC_STEREO_DOUBLE	(1 << 1) /* adjust timings for stereo modes */
 #define CRTC_NO_DBLSCAN		(1 << 2) /* don't adjust doublescan */
 #define CRTC_NO_VSCAN		(1 << 3) /* don't adjust doublescan */
-#define CRTC_STEREO_DOUBLE_ONLY	(CRTC_NO_DBLSCAN | CRTC_NO_VSCAN)
+#define CRTC_STEREO_DOUBLE_ONLY	(CRTC_STEREO_DOUBLE | CRTC_NO_DBLSCAN | CRTC_NO_VSCAN)
 
 #define DRM_MODE_FLAG_3D_MAX	DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF