| Message ID | 5bea792f91074688c88a2dab8b0a90eec6e98fdf.1495720737.git.joabreu@synopsys.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/25/2017 04:19 PM, Jose Abreu wrote: > Now that we have a callback to check if crtc and encoder supports a > given mode we can use it in vc4 so that we restrict the number of > probbed modes to the ones we can actually display. > > Also, remove the mode_fixup() calls as these are no longer needed > because mode_valid() will be called before. > > NOTE: Not even compiled tested > > Signed-off-by: Jose Abreu <joabreu@synopsys.com> > Cc: Carlos Palminha <palminha@synopsys.com> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: Eric Anholt <eric@anholt.net> > Cc: David Airlie <airlied@linux.ie> > --- > drivers/gpu/drm/vc4/vc4_crtc.c | 13 ++++++------- > drivers/gpu/drm/vc4/vc4_dpi.c | 13 ++++++------- > 2 files changed, 12 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c > index 1b4dbe9..20703c8 100644 > --- a/drivers/gpu/drm/vc4/vc4_crtc.c > +++ b/drivers/gpu/drm/vc4/vc4_crtc.c > @@ -542,18 +542,17 @@ static void vc4_crtc_enable(struct drm_crtc *crtc) > drm_crtc_vblank_on(crtc); > } > > -static bool vc4_crtc_mode_fixup(struct drm_crtc *crtc, > - const struct drm_display_mode *mode, > - struct drm_display_mode *adjusted_mode) > +static enum drm_mode_status vc4_crtc_mode_valid(struct drm_crtc *crtc, > + const struct drm_display_mode *mode) > { > /* Do not allow doublescan modes from user space */ > - if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN) { > + if (mode->flags & DRM_MODE_FLAG_DBLSCAN) { > DRM_DEBUG_KMS("[CRTC:%d] Doublescan mode rejected.\n", > crtc->base.id); > - return false; > + return MODE_NO_DBLESCAN; > } > > - return true; > + return MODE_OK; > } > > static int vc4_crtc_atomic_check(struct drm_crtc *crtc, > @@ -863,7 +862,7 @@ static void vc4_crtc_destroy_state(struct drm_crtc *crtc, > .mode_set_nofb = vc4_crtc_mode_set_nofb, > .disable = vc4_crtc_disable, > .enable = vc4_crtc_enable, > - .mode_fixup = vc4_crtc_mode_fixup, > + .mode_valid = vc4_crtc_mode_valid, > .atomic_check = vc4_crtc_atomic_check, > .atomic_flush = vc4_crtc_atomic_flush, > }; > diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c > index c6d7039..61958ab 100644 > --- a/drivers/gpu/drm/vc4/vc4_dpi.c > +++ b/drivers/gpu/drm/vc4/vc4_dpi.c > @@ -330,20 +330,19 @@ static void vc4_dpi_encoder_enable(struct drm_encoder *encoder) > } > } > > -static bool vc4_dpi_encoder_mode_fixup(struct drm_encoder *encoder, > - const struct drm_display_mode *mode, > - struct drm_display_mode *adjusted_mode) > +static enum drm_mode_status vc4_dpi_encoder_mode_valid(struct drm_encoder *encoder, > + const struct drm_display_mode *mode) > { > - if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) > - return false; > + if (mode->flags & DRM_MODE_FLAG_INTERLACE) > + return MODE_NO_INTERLACE; > > - return true; > + return MODE_OK; > } > > static const struct drm_encoder_helper_funcs vc4_dpi_encoder_helper_funcs = { > .disable = vc4_dpi_encoder_disable, > .enable = vc4_dpi_encoder_enable, > - .mode_fixup = vc4_dpi_encoder_mode_fixup, > + .mode_valid = vc4_dpi_encoder_mode_valid, > }; > > static const struct of_device_id vc4_dpi_dt_match[] = { > Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Jose Abreu <Jose.Abreu@synopsys.com> writes: > Now that we have a callback to check if crtc and encoder supports a > given mode we can use it in vc4 so that we restrict the number of > probbed modes to the ones we can actually display. "probed" > > Also, remove the mode_fixup() calls as these are no longer needed > because mode_valid() will be called before. > > NOTE: Not even compiled tested Compile-tested and Reviewed-by: Eric Anholt <eric@anholt.net>
On Fri, Jun 02, 2017 at 01:10:00PM -0700, Eric Anholt wrote: > Jose Abreu <Jose.Abreu@synopsys.com> writes: > > > Now that we have a callback to check if crtc and encoder supports a > > given mode we can use it in vc4 so that we restrict the number of > > probbed modes to the ones we can actually display. > > "probed" > > > > > Also, remove the mode_fixup() calls as these are no longer needed > > because mode_valid() will be called before. > > > > NOTE: Not even compiled tested > > Compile-tested and Reviewed-by: Eric Anholt <eric@anholt.net> Pushed to drm-misc-next, thanks. -Daniel
diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c index 1b4dbe9..20703c8 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -542,18 +542,17 @@ static void vc4_crtc_enable(struct drm_crtc *crtc) drm_crtc_vblank_on(crtc); } -static bool vc4_crtc_mode_fixup(struct drm_crtc *crtc, - const struct drm_display_mode *mode, - struct drm_display_mode *adjusted_mode) +static enum drm_mode_status vc4_crtc_mode_valid(struct drm_crtc *crtc, + const struct drm_display_mode *mode) { /* Do not allow doublescan modes from user space */ - if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN) { + if (mode->flags & DRM_MODE_FLAG_DBLSCAN) { DRM_DEBUG_KMS("[CRTC:%d] Doublescan mode rejected.\n", crtc->base.id); - return false; + return MODE_NO_DBLESCAN; } - return true; + return MODE_OK; } static int vc4_crtc_atomic_check(struct drm_crtc *crtc, @@ -863,7 +862,7 @@ static void vc4_crtc_destroy_state(struct drm_crtc *crtc, .mode_set_nofb = vc4_crtc_mode_set_nofb, .disable = vc4_crtc_disable, .enable = vc4_crtc_enable, - .mode_fixup = vc4_crtc_mode_fixup, + .mode_valid = vc4_crtc_mode_valid, .atomic_check = vc4_crtc_atomic_check, .atomic_flush = vc4_crtc_atomic_flush, }; diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c index c6d7039..61958ab 100644 --- a/drivers/gpu/drm/vc4/vc4_dpi.c +++ b/drivers/gpu/drm/vc4/vc4_dpi.c @@ -330,20 +330,19 @@ static void vc4_dpi_encoder_enable(struct drm_encoder *encoder) } } -static bool vc4_dpi_encoder_mode_fixup(struct drm_encoder *encoder, - const struct drm_display_mode *mode, - struct drm_display_mode *adjusted_mode) +static enum drm_mode_status vc4_dpi_encoder_mode_valid(struct drm_encoder *encoder, + const struct drm_display_mode *mode) { - if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) - return false; + if (mode->flags & DRM_MODE_FLAG_INTERLACE) + return MODE_NO_INTERLACE; - return true; + return MODE_OK; } static const struct drm_encoder_helper_funcs vc4_dpi_encoder_helper_funcs = { .disable = vc4_dpi_encoder_disable, .enable = vc4_dpi_encoder_enable, - .mode_fixup = vc4_dpi_encoder_mode_fixup, + .mode_valid = vc4_dpi_encoder_mode_valid, }; static const struct of_device_id vc4_dpi_dt_match[] = {
Now that we have a callback to check if crtc and encoder supports a given mode we can use it in vc4 so that we restrict the number of probbed modes to the ones we can actually display. Also, remove the mode_fixup() calls as these are no longer needed because mode_valid() will be called before. NOTE: Not even compiled tested Signed-off-by: Jose Abreu <joabreu@synopsys.com> Cc: Carlos Palminha <palminha@synopsys.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Eric Anholt <eric@anholt.net> Cc: David Airlie <airlied@linux.ie> --- drivers/gpu/drm/vc4/vc4_crtc.c | 13 ++++++------- drivers/gpu/drm/vc4/vc4_dpi.c | 13 ++++++------- 2 files changed, 12 insertions(+), 14 deletions(-)