On Wed, Jan 25, 2017 at 12:31:44PM -0500, Alex Deucher wrote:
> On Wed, Jan 25, 2017 at 1:26 AM, Daniel Vetter <daniel.vetter@xxxxxxxx> wrote:
> > The function operates on modes, not CRTCs. Also move it into
> > drm_modes.[hc]. Spotted while reviewing CRTC docs.
> >
> > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
>
> Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
Pulled in all the ones you've reviewed, thanks a lot for going through
them.
-Daniel
>
> > ---
> > drivers/gpu/drm/drm_atomic_helper.c | 2 +-
> > drivers/gpu/drm/drm_crtc.c | 23 +----------------------
> > drivers/gpu/drm/drm_modes.c | 21 +++++++++++++++++++++
> > drivers/gpu/drm/i915/intel_display.c | 4 ++--
> > include/drm/drm_crtc.h | 2 --
> > include/drm/drm_modes.h | 2 ++
> > 6 files changed, 27 insertions(+), 27 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> > index 5e512dd3a2c4..9633d12c4ed1 100644
> > --- a/drivers/gpu/drm/drm_atomic_helper.c
> > +++ b/drivers/gpu/drm/drm_atomic_helper.c
> > @@ -2369,7 +2369,7 @@ int __drm_atomic_helper_set_config(struct drm_mode_set *set,
> > if (ret != 0)
> > return ret;
> >
> > - drm_crtc_get_hv_timing(set->mode, &hdisplay, &vdisplay);
> > + drm_mode_get_hv_timing(set->mode, &hdisplay, &vdisplay);
> >
> > drm_atomic_set_fb_for_plane(primary_state, set->fb);
> > primary_state->crtc_x = 0;
> > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> > index cea7a7efa43c..5f28e3a5a3e0 100644
> > --- a/drivers/gpu/drm/drm_crtc.c
> > +++ b/drivers/gpu/drm/drm_crtc.c
> > @@ -461,27 +461,6 @@ 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
> > @@ -498,7 +477,7 @@ int drm_crtc_check_viewport(const struct drm_crtc *crtc,
> > {
> > int hdisplay, vdisplay;
> >
> > - drm_crtc_get_hv_timing(mode, &hdisplay, &vdisplay);
> > + drm_mode_get_hv_timing(mode, &hdisplay, &vdisplay);
> >
> > if (crtc->state &&
> > drm_rotation_90_or_270(crtc->primary->state->rotation))
> > diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
> > index e6b19bc9021a..73ed6399c3fb 100644
> > --- a/drivers/gpu/drm/drm_modes.c
> > +++ b/drivers/gpu/drm/drm_modes.c
> > @@ -797,6 +797,27 @@ int drm_mode_vrefresh(const struct drm_display_mode *mode)
> > EXPORT_SYMBOL(drm_mode_vrefresh);
> >
> > /**
> > + * drm_mode_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_mode_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_mode_get_hv_timing);
> > +
> > +/**
> > * drm_mode_set_crtcinfo - set CRTC modesetting timing parameters
> > * @p: mode
> > * @adjust_flags: a combination of adjustment flags
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index 7af8ddcaa075..50096f9bc420 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -11099,7 +11099,7 @@ static int intel_modeset_setup_plane_state(struct drm_atomic_state *state,
> > return PTR_ERR(plane_state);
> >
> > if (mode)
> > - drm_crtc_get_hv_timing(mode, &hdisplay, &vdisplay);
> > + drm_mode_get_hv_timing(mode, &hdisplay, &vdisplay);
> > else
> > hdisplay = vdisplay = 0;
> >
> > @@ -12992,7 +12992,7 @@ 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_crtc_get_hv_timing(&pipe_config->base.mode,
> > + drm_mode_get_hv_timing(&pipe_config->base.mode,
> > &pipe_config->pipe_src_w,
> > &pipe_config->pipe_src_h);
> >
> > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
> > index bef18a1fa36e..816edab054e6 100644
> > --- a/include/drm/drm_crtc.h
> > +++ b/include/drm/drm_crtc.h
> > @@ -826,8 +826,6 @@ static inline uint32_t drm_crtc_mask(const struct drm_crtc *crtc)
> > return 1 << drm_crtc_index(crtc);
> > }
> >
> > -void drm_crtc_get_hv_timing(const struct drm_display_mode *mode,
> > - int *hdisplay, int *vdisplay);
> > int drm_crtc_force_disable(struct drm_crtc *crtc);
> > int drm_crtc_force_disable_all(struct drm_device *dev);
> >
> > diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h
> > index 9934d91619c1..6dd34280e892 100644
> > --- a/include/drm/drm_modes.h
> > +++ b/include/drm/drm_modes.h
> > @@ -459,6 +459,8 @@ int of_get_drm_display_mode(struct device_node *np,
> > void drm_mode_set_name(struct drm_display_mode *mode);
> > int drm_mode_hsync(const struct drm_display_mode *mode);
> > int drm_mode_vrefresh(const struct drm_display_mode *mode);
> > +void drm_mode_get_hv_timing(const struct drm_display_mode *mode,
> > + int *hdisplay, int *vdisplay);
> >
> > void drm_mode_set_crtcinfo(struct drm_display_mode *p,
> > int adjust_flags);
> > --
> > 2.11.0
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@xxxxxxxxxxxxxxxxxxxxx
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
