Commit f2ecf2e3 authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm: Make drm_match_cea_mode() return the underlying 2D VIC for 3d modes 



When scanning out a stereo mode, the AVI infoframe vic field has to be
the underlyng 2D VIC. Before that commit, we weren't matching the CEA
mode because of the extra stereo flag and then were setting the VIC
field in the AVI infoframe to 0.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Acked-by: default avatarDave Airlie <airlied@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4eed4a0a

drivers/gpu/drm/drm_edid.c

+2 −2
Original line number Diff line number Diff line
@@ -2404,7 +2404,7 @@ u8 drm_match_cea_mode(const struct drm_display_mode *to_match) 


		if ((KHZ2PICOS(to_match->clock) == KHZ2PICOS(clock1) ||

		     KHZ2PICOS(to_match->clock) == KHZ2PICOS(clock2)) &&

		    drm_mode_equal_no_clocks(to_match, cea_mode))

		    drm_mode_equal_no_clocks_no_stereo(to_match, cea_mode))

			return mode + 1;

	}

	return 0;
@@ -2453,7 +2453,7 @@ static u8 drm_match_hdmi_mode(const struct drm_display_mode *to_match) 


		if ((KHZ2PICOS(to_match->clock) == KHZ2PICOS(clock1) ||

		     KHZ2PICOS(to_match->clock) == KHZ2PICOS(clock2)) &&

		    drm_mode_equal_no_clocks(to_match, hdmi_mode))

		    drm_mode_equal_no_clocks_no_stereo(to_match, hdmi_mode))

			return mode + 1;

	}

	return 0;

drivers/gpu/drm/drm_modes.c

+12 −6
Original line number Diff line number Diff line
@@ -830,12 +830,16 @@ bool drm_mode_equal(const struct drm_display_mode *mode1, const struct drm_displ 
	} else if (mode1->clock != mode2->clock)

		return false;



	return drm_mode_equal_no_clocks(mode1, mode2);

	if ((mode1->flags & DRM_MODE_FLAG_3D_MASK) !=

	    (mode2->flags & DRM_MODE_FLAG_3D_MASK))

		return false;



	return drm_mode_equal_no_clocks_no_stereo(mode1, mode2);

}

EXPORT_SYMBOL(drm_mode_equal);



/**

 * drm_mode_equal_no_clocks - test modes for equality

 * drm_mode_equal_no_clocks_no_stereo - test modes for equality

 * @mode1: first mode

 * @mode2: second mode

 *
@@ -843,12 +847,13 @@ EXPORT_SYMBOL(drm_mode_equal); 
 * None.

 *

 * Check to see if @mode1 and @mode2 are equivalent, but

 * don't check the pixel clocks.

 * don't check the pixel clocks nor the stereo layout.

 *

 * RETURNS:

 * True if the modes are equal, false otherwise.

 */

bool drm_mode_equal_no_clocks(const struct drm_display_mode *mode1, const struct drm_display_mode *mode2)

bool drm_mode_equal_no_clocks_no_stereo(const struct drm_display_mode *mode1,

					const struct drm_display_mode *mode2)

{

	if (mode1->hdisplay == mode2->hdisplay &&

	    mode1->hsync_start == mode2->hsync_start &&
@@ -860,12 +865,13 @@ bool drm_mode_equal_no_clocks(const struct drm_display_mode *mode1, const struct 
	    mode1->vsync_end == mode2->vsync_end &&

	    mode1->vtotal == mode2->vtotal &&

	    mode1->vscan == mode2->vscan &&

	    mode1->flags == mode2->flags)

	    (mode1->flags & ~DRM_MODE_FLAG_3D_MASK) ==

	     (mode2->flags & ~DRM_MODE_FLAG_3D_MASK))

		return true;



	return false;

}

EXPORT_SYMBOL(drm_mode_equal_no_clocks);

EXPORT_SYMBOL(drm_mode_equal_no_clocks_no_stereo);



/**

 * drm_mode_validate_size - make sure modes adhere to size constraints

include/drm/drm_crtc.h

+1 −1
Original line number Diff line number Diff line
@@ -989,7 +989,7 @@ extern void drm_mode_config_reset(struct drm_device *dev); 
extern void drm_mode_config_cleanup(struct drm_device *dev);

extern void drm_mode_set_name(struct drm_display_mode *mode);

extern bool drm_mode_equal(const struct drm_display_mode *mode1, const struct drm_display_mode *mode2);

extern bool drm_mode_equal_no_clocks(const struct drm_display_mode *mode1, const struct drm_display_mode *mode2);

extern bool drm_mode_equal_no_clocks_no_stereo(const struct drm_display_mode *mode1, const struct drm_display_mode *mode2);

extern int drm_mode_width(const struct drm_display_mode *mode);

extern int drm_mode_height(const struct drm_display_mode *mode);

CRA Git | Maintained and supported by SUSTech CRA and CCSE