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

Shuang He Feb. 17, 2015, 12:41 a.m. UTC | #1
Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 5784
-------------------------------------Summary-------------------------------------
Platform          Delta          drm-intel-nightly          Series Applied
PNV                 -36              277/277              241/277
ILK                                  313/313              313/313
SNB                                  309/309              309/309
IVB                 -1              382/382              381/382
BYT                                  296/296              296/296
HSW                                  425/425              425/425
BDW                 -1              318/318              317/318
-------------------------------------Detailed-------------------------------------
Platform  Test                                drm-intel-nightly          Series Applied
*PNV  igt_gem_persistent_relocs_forked-faulting-reloc-thrashing      PASS(2)      NRUN(1)
*PNV  igt_gem_persistent_relocs_forked-interruptible      PASS(2)      NRUN(1)
*PNV  igt_gem_pwrite_pread_display-copy-correctness      PASS(2)      NRUN(1)
*PNV  igt_gem_reloc_overflow_source-offset-negative-reloc-gtt      PASS(2)      NRUN(1)
*PNV  igt_gem_reloc_overflow_source-offset-unaligned-reloc-gtt      PASS(2)      NRUN(1)
*PNV  igt_gem_reloc_vs_gpu_faulting-reloc-interruptible      PASS(2)      NRUN(1)
*PNV  igt_gem_set_tiling_vs_blt_tiled-to-untiled      PASS(2)      NRUN(1)
*PNV  igt_gem_tiling_max_stride      NO_RESULT(1)PASS(1)      NRUN(1)
*PNV  igt_gem_userptr_blits_coherency-sync      PASS(3)      NRUN(1)
*PNV  igt_gem_userptr_blits_forked-sync-swapping-multifd-mempressure-interruptible      PASS(2)      NRUN(1)
*PNV  igt_gem_userptr_blits_forked-sync-swapping-multifd-mempressure-normal      PASS(2)      NRUN(1)
*PNV  igt_gem_userptr_blits_minor-unsync-normal      PASS(2)      NRUN(1)
*PNV  igt_gem_userptr_blits_process-exit      PASS(2)      NRUN(1)
*PNV  igt_gem_userptr_blits_sync-overlap      PASS(2)      NRUN(1)
*PNV  igt_gem_userptr_blits_sync-unmap      PASS(2)      NRUN(1)
*PNV  igt_gem_userptr_blits_sync-unmap-after-close      PASS(2)      NRUN(1)
*PNV  igt_gem_userptr_blits_unsync-unmap      PASS(2)      NRUN(1)
*PNV  igt_gem_userptr_blits_unsync-unmap-cycles      PASS(2)      NRUN(1)
*PNV  igt_gem_userptr_blits_usage-restrictions      PASS(2)      NRUN(1)
*PNV  igt_kms_addfb_bad-pitch-1024      PASS(2)      NRUN(1)
*PNV  igt_kms_addfb_bad-pitch-128      PASS(2)      NRUN(1)
*PNV  igt_kms_addfb_bad-pitch-256      PASS(2)      NRUN(1)
*PNV  igt_kms_addfb_bad-pitch-32      PASS(2)      NRUN(1)
*PNV  igt_kms_addfb_bad-pitch-65536      PASS(2)      NRUN(1)
*PNV  igt_kms_addfb_bo-too-small-due-to-tiling      PASS(2)      NRUN(1)
*PNV  igt_kms_addfb_framebuffer-vs-set-tiling      PASS(2)      NRUN(1)
*PNV  igt_kms_addfb_normal      PASS(2)      NRUN(1)
*PNV  igt_kms_addfb_size-max      PASS(2)      NRUN(1)
*PNV  igt_kms_addfb_small-bo      PASS(2)      NRUN(1)
*PNV  igt_kms_addfb_too-high      PASS(2)      NRUN(1)
*PNV  igt_kms_addfb_too-wide      PASS(2)      NRUN(1)
*PNV  igt_kms_pipe_crc_basic_bad-nb-words-1      PASS(2)      NRUN(1)
*PNV  igt_prime_self_import_reimport-vs-gem_close-race      PASS(2)      NRUN(1)
*PNV  igt_template_A      PASS(2)      NRUN(1)
*PNV  igt_gem_partial_pwrite_pread_reads      PASS(2)      NRUN(1)
*PNV  igt_gem_partial_pwrite_pread_reads-display      PASS(2)      NO_RESULT(1)
*IVB  igt_gem_storedw_batches_loop_normal      PASS(3)      DMESG_WARN(1)PASS(1)
*BDW  igt_gem_gtt_hog      PASS(5)      DMESG_WARN(1)PASS(1)
Note: You need to pay more attention to line start with '*'
Matt Roper Feb. 17, 2015, 6:05 p.m. UTC | #2
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 | #3
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