| Message ID | 95fd6c06c58bd0b957e36a8d7068e6a74b581304.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 supports a given mode > we can use it in atmel-hlcdc so that we restrict the number of probbed > modes to the ones we can actually display. > > Also, remove the mode_fixup() callback as this is 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: Boris Brezillon <boris.brezillon@free-electrons.com> > Cc: David Airlie <airlied@linux.ie> > --- > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > index 53bfa56..bdfe74e 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > @@ -140,13 +140,12 @@ static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c) > cfg); > } > > -static bool atmel_hlcdc_crtc_mode_fixup(struct drm_crtc *c, > - const struct drm_display_mode *mode, > - struct drm_display_mode *adjusted_mode) > +static enum drm_mode_status atmel_hlcdc_crtc_mode_valid(struct drm_crtc *c, > + const struct drm_display_mode *mode) > { > struct atmel_hlcdc_crtc *crtc = drm_crtc_to_atmel_hlcdc_crtc(c); > > - return atmel_hlcdc_dc_mode_valid(crtc->dc, adjusted_mode) == MODE_OK; > + return atmel_hlcdc_dc_mode_valid(crtc->dc, mode); > } > > static void atmel_hlcdc_crtc_disable(struct drm_crtc *c) > @@ -315,7 +314,7 @@ static void atmel_hlcdc_crtc_atomic_flush(struct drm_crtc *crtc, > } > > static const struct drm_crtc_helper_funcs lcdc_crtc_helper_funcs = { > - .mode_fixup = atmel_hlcdc_crtc_mode_fixup, > + .mode_valid = atmel_hlcdc_crtc_mode_valid, > .mode_set = drm_helper_crtc_mode_set, > .mode_set_nofb = atmel_hlcdc_crtc_mode_set_nofb, > .mode_set_base = drm_helper_crtc_mode_set_base, > Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
On Thu, 25 May 2017 15:19:21 +0100 Jose Abreu <Jose.Abreu@synopsys.com> wrote: > Now that we have a callback to check if crtc supports a given mode > we can use it in atmel-hlcdc so that we restrict the number of probbed > modes to the ones we can actually display. > > Also, remove the mode_fixup() callback as this is no longer needed > because mode_valid() will be called before. > > NOTE: Not even compiled tested Applied to drm-misc-next after fixing a compilation warning and reformating to checkpatch happy. Thanks, Boris > > Signed-off-by: Jose Abreu <joabreu@synopsys.com> > Cc: Carlos Palminha <palminha@synopsys.com> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: Boris Brezillon <boris.brezillon@free-electrons.com> > Cc: David Airlie <airlied@linux.ie> > --- > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > index 53bfa56..bdfe74e 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > @@ -140,13 +140,12 @@ static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c) > cfg); > } > > -static bool atmel_hlcdc_crtc_mode_fixup(struct drm_crtc *c, > - const struct drm_display_mode *mode, > - struct drm_display_mode *adjusted_mode) > +static enum drm_mode_status atmel_hlcdc_crtc_mode_valid(struct drm_crtc *c, > + const struct drm_display_mode *mode) > { > struct atmel_hlcdc_crtc *crtc = drm_crtc_to_atmel_hlcdc_crtc(c); > > - return atmel_hlcdc_dc_mode_valid(crtc->dc, adjusted_mode) == MODE_OK; > + return atmel_hlcdc_dc_mode_valid(crtc->dc, mode); > } > > static void atmel_hlcdc_crtc_disable(struct drm_crtc *c) > @@ -315,7 +314,7 @@ static void atmel_hlcdc_crtc_atomic_flush(struct drm_crtc *crtc, > } > > static const struct drm_crtc_helper_funcs lcdc_crtc_helper_funcs = { > - .mode_fixup = atmel_hlcdc_crtc_mode_fixup, > + .mode_valid = atmel_hlcdc_crtc_mode_valid, > .mode_set = drm_helper_crtc_mode_set, > .mode_set_nofb = atmel_hlcdc_crtc_mode_set_nofb, > .mode_set_base = drm_helper_crtc_mode_set_base,
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c index 53bfa56..bdfe74e 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c @@ -140,13 +140,12 @@ static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c) cfg); } -static bool atmel_hlcdc_crtc_mode_fixup(struct drm_crtc *c, - const struct drm_display_mode *mode, - struct drm_display_mode *adjusted_mode) +static enum drm_mode_status atmel_hlcdc_crtc_mode_valid(struct drm_crtc *c, + const struct drm_display_mode *mode) { struct atmel_hlcdc_crtc *crtc = drm_crtc_to_atmel_hlcdc_crtc(c); - return atmel_hlcdc_dc_mode_valid(crtc->dc, adjusted_mode) == MODE_OK; + return atmel_hlcdc_dc_mode_valid(crtc->dc, mode); } static void atmel_hlcdc_crtc_disable(struct drm_crtc *c) @@ -315,7 +314,7 @@ static void atmel_hlcdc_crtc_atomic_flush(struct drm_crtc *crtc, } static const struct drm_crtc_helper_funcs lcdc_crtc_helper_funcs = { - .mode_fixup = atmel_hlcdc_crtc_mode_fixup, + .mode_valid = atmel_hlcdc_crtc_mode_valid, .mode_set = drm_helper_crtc_mode_set, .mode_set_nofb = atmel_hlcdc_crtc_mode_set_nofb, .mode_set_base = drm_helper_crtc_mode_set_base,
Now that we have a callback to check if crtc supports a given mode we can use it in atmel-hlcdc so that we restrict the number of probbed modes to the ones we can actually display. Also, remove the mode_fixup() callback as this is 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: Boris Brezillon <boris.brezillon@free-electrons.com> Cc: David Airlie <airlied@linux.ie> --- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)