On 11/24/2014 09:52 PM, Matt Roper wrote:
From: Gustavo Padovan gustavo.padovan@collabora.co.uk
We need to get hdisplay and vdisplay in a few places so create a helper to make our job easier.
v2 (by Matt): Use new stereo doubling function (suggested by Ville)
v3 (by Matt):
- Add missing kerneldoc (Daniel)
- Use drm_mode_copy() (Jani)
v4 (by Matt):
- Drop stereo doubling function again; add 'stereo only' flag to drm_mode_set_crtcinfo() instead (Ville)
Cc: dri-devel@lists.freedesktop.org Suggested-by: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Gustavo Padovan gustavo.padovan@collabora.co.uk Signed-off-by: Matt Roper matthew.d.roper@intel.com
drivers/gpu/drm/drm_crtc.c | 32 ++++++++++++++++++++++---------- drivers/gpu/drm/drm_modes.c | 24 ++++++++++++++---------- drivers/gpu/drm/i915/intel_display.c | 6 +++--- include/drm/drm_crtc.h | 2 ++ include/drm/drm_modes.h | 3 +++ 5 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 589a921..f06f1b4 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -2499,6 +2499,27 @@ int drm_mode_set_config_internal(struct drm_mode_set *set) EXPORT_SYMBOL(drm_mode_set_config_internal);
/**
- drm_crtc_get_hv_timing - Fetches hdisplay/vdisplay for given mode
- @mode: mode to query
- @hdisplay: hdisplay value to fill in
- @vdisplay: vdisplay value to fill in
- The vdisplay value will be doubled if the specified mode is a stereo mode of
- the appropriate layout.
- */
+void drm_crtc_get_hv_timing(const struct drm_display_mode *mode,
int *hdisplay, int *vdisplay)+{
- struct drm_display_mode adjusted;
- drm_mode_copy(&adjusted, mode);
- drm_mode_set_crtcinfo(&adjusted, CRTC_STEREO_DOUBLE_ONLY);
- *hdisplay = adjusted.crtc_hdisplay;
- *vdisplay = adjusted.crtc_vdisplay;
+} +EXPORT_SYMBOL(drm_crtc_get_hv_timing);
+/**
- drm_crtc_check_viewport - Checks that a framebuffer is big enough for the
CRTC viewport- @crtc: CRTC that framebuffer will be displayed on
@@ -2515,16 +2536,7 @@ int drm_crtc_check_viewport(const struct drm_crtc *crtc, { int hdisplay, vdisplay;
- hdisplay = mode->hdisplay;
- vdisplay = mode->vdisplay;
- if (drm_mode_is_stereo(mode)) {
struct drm_display_mode adjusted = *mode;drm_mode_set_crtcinfo(&adjusted, CRTC_STEREO_DOUBLE);hdisplay = adjusted.crtc_hdisplay;vdisplay = adjusted.crtc_vdisplay;- }
- drm_crtc_get_hv_timing(mode, &hdisplay, &vdisplay);
This changes the behavior slightly since before, for stereo modes, dbl_scan and vscan would affect hdisplay and vdisplay. If I understand correctly the old behavior is a bug, but it would be good to state that the change is intentional.
if (crtc->invert_dimensions) swap(hdisplay, vdisplay); diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 6d8b941..fd5479b 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -765,18 +765,22 @@ void drm_mode_set_crtcinfo(struct drm_display_mode *p, int adjust_flags) } }
- if (p->flags & DRM_MODE_FLAG_DBLSCAN) {
p->crtc_vdisplay *= 2;p->crtc_vsync_start *= 2;p->crtc_vsync_end *= 2;p->crtc_vtotal *= 2;
- if (!(adjust_flags & CRTC_NO_DBLSCAN)) {
if (p->flags & DRM_MODE_FLAG_DBLSCAN) {p->crtc_vdisplay *= 2;p->crtc_vsync_start *= 2;p->crtc_vsync_end *= 2;p->crtc_vtotal *= 2;}
- if (p->vscan > 1) {
p->crtc_vdisplay *= p->vscan;p->crtc_vsync_start *= p->vscan;p->crtc_vsync_end *= p->vscan;p->crtc_vtotal *= p->vscan;
if (!(adjust_flags & CRTC_NO_VSCAN)) {
if (p->vscan > 1) {p->crtc_vdisplay *= p->vscan;p->crtc_vsync_start *= p->vscan;p->crtc_vsync_end *= p->vscan;p->crtc_vtotal *= p->vscan;}}
if (adjust_flags & CRTC_STEREO_DOUBLE) {
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a3d2a44..b87aeab 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10205,9 +10205,9 @@ intel_modeset_pipe_config(struct drm_crtc *crtc, * computation to clearly distinguish it from the adjusted mode, which * can be changed by the connectors in the below retry loop. */
- drm_mode_set_crtcinfo(&pipe_config->requested_mode, CRTC_STEREO_DOUBLE);
- pipe_config->pipe_src_w = pipe_config->requested_mode.crtc_hdisplay;
- pipe_config->pipe_src_h = pipe_config->requested_mode.crtc_vdisplay;
- drm_crtc_get_hv_timing(&pipe_config->requested_mode,
&pipe_config->pipe_src_w,&pipe_config->pipe_src_h);
Same thing here.
encoder_retry: /* Ensure the port clock defaults are reset when retrying. */ diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index b459e8f..6e46c5d 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -1140,6 +1140,8 @@ extern int drm_plane_init(struct drm_device *dev, extern void drm_plane_cleanup(struct drm_plane *plane); extern unsigned int drm_plane_index(struct drm_plane *plane); extern void drm_plane_force_disable(struct drm_plane *plane); +extern void drm_crtc_get_hv_timing(const struct drm_display_mode *mode,
int *hdisplay, int *vdisplay);diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h index 91d0582..8f17811 100644 --- a/include/drm/drm_modes.h +++ b/include/drm/drm_modes.h @@ -90,6 +90,9 @@ enum drm_mode_status {
#define CRTC_INTERLACE_HALVE_V (1 << 0) /* halve V values for interlacing */ #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)
The kernel doc of drm_mode_set_crtcinfo() has a brief explanation of what the flags above do. I think it would be proper to update that with the new additions.
Cheers, Ander
#define DRM_MODE_FLAG_3D_MAX DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF