From: nicolas.ferre@atmel.com (Nicolas Ferre)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 8/8] drm: atmel-hlcdc: check display mode validity in crtc->mode_fixup()
Date: Tue, 8 Mar 2016 16:44:23 +0100 [thread overview]
Message-ID: <56DEF357.5050003@atmel.com> (raw)
In-Reply-To: <1452075569-8545-9-git-send-email-boris.brezillon@free-electrons.com>
Le 06/01/2016 11:19, Boris Brezillon a ?crit :
> Move the adjusted display mode check into ->mode_fixup().
>
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Seems okay:
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> index be30bd2..d5a028f 100644
> --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> @@ -142,11 +142,13 @@ static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c)
> cfg);
> }
>
> -static bool atmel_hlcdc_crtc_mode_fixup(struct drm_crtc *crtc,
> +static bool atmel_hlcdc_crtc_mode_fixup(struct drm_crtc *c,
> const struct drm_display_mode *mode,
> struct drm_display_mode *adjusted_mode)
> {
> - return true;
> + struct atmel_hlcdc_crtc *crtc = drm_crtc_to_atmel_hlcdc_crtc(c);
> +
> + return atmel_hlcdc_dc_mode_valid(crtc->dc, adjusted_mode) == MODE_OK;
> }
>
> static void atmel_hlcdc_crtc_disable(struct drm_crtc *c)
> @@ -311,12 +313,8 @@ static int atmel_hlcdc_crtc_select_output_mode(struct drm_crtc_state *state)
> static int atmel_hlcdc_crtc_atomic_check(struct drm_crtc *c,
> struct drm_crtc_state *s)
> {
> - struct atmel_hlcdc_crtc *crtc = drm_crtc_to_atmel_hlcdc_crtc(c);
> int ret;
>
> - if (atmel_hlcdc_dc_mode_valid(crtc->dc, &s->adjusted_mode) != MODE_OK)
> - return -EINVAL;
> -
> ret = atmel_hlcdc_crtc_select_output_mode(s);
> if (ret)
> return ret;
>
--
Nicolas Ferre
WARNING: multiple messages have this Message-ID (diff)
From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: Boris Brezillon <boris.brezillon@free-electrons.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
dri-devel@lists.freedesktop.org
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>,
Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 8/8] drm: atmel-hlcdc: check display mode validity in crtc->mode_fixup()
Date: Tue, 8 Mar 2016 16:44:23 +0100 [thread overview]
Message-ID: <56DEF357.5050003@atmel.com> (raw)
In-Reply-To: <1452075569-8545-9-git-send-email-boris.brezillon@free-electrons.com>
Le 06/01/2016 11:19, Boris Brezillon a écrit :
> Move the adjusted display mode check into ->mode_fixup().
>
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Seems okay:
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> index be30bd2..d5a028f 100644
> --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> @@ -142,11 +142,13 @@ static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c)
> cfg);
> }
>
> -static bool atmel_hlcdc_crtc_mode_fixup(struct drm_crtc *crtc,
> +static bool atmel_hlcdc_crtc_mode_fixup(struct drm_crtc *c,
> const struct drm_display_mode *mode,
> struct drm_display_mode *adjusted_mode)
> {
> - return true;
> + struct atmel_hlcdc_crtc *crtc = drm_crtc_to_atmel_hlcdc_crtc(c);
> +
> + return atmel_hlcdc_dc_mode_valid(crtc->dc, adjusted_mode) == MODE_OK;
> }
>
> static void atmel_hlcdc_crtc_disable(struct drm_crtc *c)
> @@ -311,12 +313,8 @@ static int atmel_hlcdc_crtc_select_output_mode(struct drm_crtc_state *state)
> static int atmel_hlcdc_crtc_atomic_check(struct drm_crtc *c,
> struct drm_crtc_state *s)
> {
> - struct atmel_hlcdc_crtc *crtc = drm_crtc_to_atmel_hlcdc_crtc(c);
> int ret;
>
> - if (atmel_hlcdc_dc_mode_valid(crtc->dc, &s->adjusted_mode) != MODE_OK)
> - return -EINVAL;
> -
> ret = atmel_hlcdc_crtc_select_output_mode(s);
> if (ret)
> return ret;
>
--
Nicolas Ferre
next prev parent reply other threads:[~2016-03-08 15:44 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-06 10:19 [PATCH 0/8] drm: atmel-hlcdc: various fixes/improvements Boris Brezillon
2016-01-06 10:19 ` Boris Brezillon
2016-01-06 10:19 ` [PATCH 1/8] drm: atmel-hlcdc: add a ->cleanup_fb() operation Boris Brezillon
2016-01-06 10:19 ` Boris Brezillon
2016-03-08 15:03 ` Nicolas Ferre
2016-03-08 15:03 ` Nicolas Ferre
2016-01-06 10:19 ` [PATCH 2/8] drm: atmel-hlcdc: support asynchronous atomic commit operations Boris Brezillon
2016-01-06 10:19 ` Boris Brezillon
2016-01-06 10:19 ` [PATCH 3/8] drm: atmel-hlcdc: fix connector and encoder types Boris Brezillon
2016-01-06 10:19 ` Boris Brezillon
2016-03-08 15:03 ` Nicolas Ferre
2016-03-08 15:03 ` Nicolas Ferre
2016-01-06 10:19 ` [PATCH 4/8] drm: atmel-hlcdc: remove leftovers from atomic mode setting migration Boris Brezillon
2016-01-06 10:19 ` Boris Brezillon
2016-03-08 15:04 ` Nicolas Ferre
2016-03-08 15:04 ` Nicolas Ferre
2016-01-06 10:19 ` [PATCH 5/8] drm: atmel-hlcdc: support extended timing ranges on sama5d4 and sama5d2 Boris Brezillon
2016-01-06 10:19 ` Boris Brezillon
2016-03-08 15:08 ` Nicolas Ferre
2016-03-08 15:08 ` Nicolas Ferre
2016-01-06 10:19 ` [PATCH 6/8] drm: atmel-hlcdc: move output mode selection in CRTC implementation Boris Brezillon
2016-01-06 10:19 ` Boris Brezillon
2016-01-06 10:19 ` [PATCH 7/8] drm: atmel-hlcdc: rework the output code to support drm bridges Boris Brezillon
2016-01-06 10:19 ` Boris Brezillon
2016-01-06 10:19 ` [PATCH 8/8] drm: atmel-hlcdc: check display mode validity in crtc->mode_fixup() Boris Brezillon
2016-01-06 10:19 ` Boris Brezillon
2016-03-08 15:44 ` Nicolas Ferre [this message]
2016-03-08 15:44 ` Nicolas Ferre
2016-03-01 10:55 ` [PATCH 0/8] drm: atmel-hlcdc: various fixes/improvements Boris Brezillon
2016-03-01 10:55 ` Boris Brezillon
2016-03-17 2:43 ` Dave Airlie
2016-03-17 2:43 ` Dave Airlie
2016-03-17 8:33 ` Boris Brezillon
2016-03-17 8:33 ` Boris Brezillon
2016-03-16 13:06 ` Nicolas Ferre
2016-03-16 13:06 ` Nicolas Ferre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56DEF357.5050003@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.