* [PATCH 1/2] drm: Make the connector mode_valid() vfunc return a drm_mode_status enum
@ 2013-11-28 15:29 Damien Lespiau
2013-11-28 15:29 ` [PATCH 2/2] drm/i915: Return a drm_mode_status enum in the mode_valid vfuncs Damien Lespiau
2013-11-28 15:49 ` [PATCH 1/2] drm: Make the connector mode_valid() vfunc return a drm_mode_status enum Daniel Vetter
0 siblings, 2 replies; 5+ messages in thread
From: Damien Lespiau @ 2013-11-28 15:29 UTC (permalink / raw)
To: intel-gfx; +Cc: dri-devel
To make it clear what exactly mode_valid() should return.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
include/drm/drm_crtc_helper.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
index ef6ad3a..b1388b5 100644
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
@@ -120,8 +120,8 @@ struct drm_encoder_helper_funcs {
*/
struct drm_connector_helper_funcs {
int (*get_modes)(struct drm_connector *connector);
- int (*mode_valid)(struct drm_connector *connector,
- struct drm_display_mode *mode);
+ enum drm_mode_status (*mode_valid)(struct drm_connector *connector,
+ struct drm_display_mode *mode);
struct drm_encoder *(*best_encoder)(struct drm_connector *connector);
};
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] drm/i915: Return a drm_mode_status enum in the mode_valid vfuncs
2013-11-28 15:29 [PATCH 1/2] drm: Make the connector mode_valid() vfunc return a drm_mode_status enum Damien Lespiau
@ 2013-11-28 15:29 ` Damien Lespiau
2013-11-28 15:49 ` Daniel Vetter
2013-11-28 15:49 ` [PATCH 1/2] drm: Make the connector mode_valid() vfunc return a drm_mode_status enum Daniel Vetter
1 sibling, 1 reply; 5+ messages in thread
From: Damien Lespiau @ 2013-11-28 15:29 UTC (permalink / raw)
To: intel-gfx; +Cc: dri-devel
We had some mode_valid() vfuncs returning an int, others the enum. Let's
use the latter everywhere.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
drivers/gpu/drm/i915/intel_crt.c | 5 +++--
drivers/gpu/drm/i915/intel_dp.c | 2 +-
drivers/gpu/drm/i915/intel_dsi.c | 5 +++--
drivers/gpu/drm/i915/intel_dvo.c | 5 +++--
drivers/gpu/drm/i915/intel_hdmi.c | 5 +++--
drivers/gpu/drm/i915/intel_lvds.c | 5 +++--
drivers/gpu/drm/i915/intel_sdvo.c | 5 +++--
7 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index b5b1b9b..e2e39e6 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -222,8 +222,9 @@ static void intel_crt_dpms(struct drm_connector *connector, int mode)
intel_modeset_check_state(connector->dev);
}
-static int intel_crt_mode_valid(struct drm_connector *connector,
- struct drm_display_mode *mode)
+static enum drm_mode_status
+intel_crt_mode_valid(struct drm_connector *connector,
+ struct drm_display_mode *mode)
{
struct drm_device *dev = connector->dev;
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index c36a227..7c54f62 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -142,7 +142,7 @@ intel_dp_max_data_rate(int max_link_clock, int max_lanes)
return (max_link_clock * max_lanes * 8) / 10;
}
-static int
+static enum drm_mode_status
intel_dp_mode_valid(struct drm_connector *connector,
struct drm_display_mode *mode)
{
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index d257b09..7b9b350 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -251,8 +251,9 @@ static void intel_dsi_get_config(struct intel_encoder *encoder,
/* XXX: read flags, set to adjusted_mode */
}
-static int intel_dsi_mode_valid(struct drm_connector *connector,
- struct drm_display_mode *mode)
+static enum drm_mode_status
+intel_dsi_mode_valid(struct drm_connector *connector,
+ struct drm_display_mode *mode)
{
struct intel_connector *intel_connector = to_intel_connector(connector);
struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index 3c77365..eeff998 100644
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
@@ -234,8 +234,9 @@ static void intel_dvo_dpms(struct drm_connector *connector, int mode)
intel_modeset_check_state(connector->dev);
}
-static int intel_dvo_mode_valid(struct drm_connector *connector,
- struct drm_display_mode *mode)
+static enum drm_mode_status
+intel_dvo_mode_valid(struct drm_connector *connector,
+ struct drm_display_mode *mode)
{
struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index d0c81b1..6a6ad0c 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -853,8 +853,9 @@ static int hdmi_portclock_limit(struct intel_hdmi *hdmi)
return 225000;
}
-static int intel_hdmi_mode_valid(struct drm_connector *connector,
- struct drm_display_mode *mode)
+static enum drm_mode_status
+intel_hdmi_mode_valid(struct drm_connector *connector,
+ struct drm_display_mode *mode)
{
if (mode->clock > hdmi_portclock_limit(intel_attached_hdmi(connector)))
return MODE_CLOCK_HIGH;
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index c3b4da7..3deb58e 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -256,8 +256,9 @@ static void intel_disable_lvds(struct intel_encoder *encoder)
POSTING_READ(lvds_encoder->reg);
}
-static int intel_lvds_mode_valid(struct drm_connector *connector,
- struct drm_display_mode *mode)
+static enum drm_mode_status
+intel_lvds_mode_valid(struct drm_connector *connector,
+ struct drm_display_mode *mode)
{
struct intel_connector *intel_connector = to_intel_connector(connector);
struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index e4f9918..2abeab0 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1536,8 +1536,9 @@ static void intel_sdvo_dpms(struct drm_connector *connector, int mode)
intel_modeset_check_state(connector->dev);
}
-static int intel_sdvo_mode_valid(struct drm_connector *connector,
- struct drm_display_mode *mode)
+static enum drm_mode_status
+intel_sdvo_mode_valid(struct drm_connector *connector,
+ struct drm_display_mode *mode)
{
struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] drm: Make the connector mode_valid() vfunc return a drm_mode_status enum
2013-11-28 15:29 [PATCH 1/2] drm: Make the connector mode_valid() vfunc return a drm_mode_status enum Damien Lespiau
2013-11-28 15:29 ` [PATCH 2/2] drm/i915: Return a drm_mode_status enum in the mode_valid vfuncs Damien Lespiau
@ 2013-11-28 15:49 ` Daniel Vetter
1 sibling, 0 replies; 5+ messages in thread
From: Daniel Vetter @ 2013-11-28 15:49 UTC (permalink / raw)
To: Damien Lespiau; +Cc: intel-gfx, dri-devel
On Thu, Nov 28, 2013 at 03:29:17PM +0000, Damien Lespiau wrote:
> To make it clear what exactly mode_valid() should return.
>
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> include/drm/drm_crtc_helper.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
> index ef6ad3a..b1388b5 100644
> --- a/include/drm/drm_crtc_helper.h
> +++ b/include/drm/drm_crtc_helper.h
> @@ -120,8 +120,8 @@ struct drm_encoder_helper_funcs {
> */
> struct drm_connector_helper_funcs {
> int (*get_modes)(struct drm_connector *connector);
> - int (*mode_valid)(struct drm_connector *connector,
> - struct drm_display_mode *mode);
> + enum drm_mode_status (*mode_valid)(struct drm_connector *connector,
> + struct drm_display_mode *mode);
> struct drm_encoder *(*best_encoder)(struct drm_connector *connector);
> };
>
> --
> 1.8.3.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drm/i915: Return a drm_mode_status enum in the mode_valid vfuncs
2013-11-28 15:29 ` [PATCH 2/2] drm/i915: Return a drm_mode_status enum in the mode_valid vfuncs Damien Lespiau
@ 2013-11-28 15:49 ` Daniel Vetter
2013-12-02 13:42 ` Thierry Reding
0 siblings, 1 reply; 5+ messages in thread
From: Daniel Vetter @ 2013-11-28 15:49 UTC (permalink / raw)
To: Damien Lespiau; +Cc: intel-gfx, dri-devel
On Thu, Nov 28, 2013 at 03:29:18PM +0000, Damien Lespiau wrote:
> We had some mode_valid() vfuncs returning an int, others the enum. Let's
> use the latter everywhere.
>
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Yeah, makes sense. Queued for -next, thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/i915/intel_crt.c | 5 +++--
> drivers/gpu/drm/i915/intel_dp.c | 2 +-
> drivers/gpu/drm/i915/intel_dsi.c | 5 +++--
> drivers/gpu/drm/i915/intel_dvo.c | 5 +++--
> drivers/gpu/drm/i915/intel_hdmi.c | 5 +++--
> drivers/gpu/drm/i915/intel_lvds.c | 5 +++--
> drivers/gpu/drm/i915/intel_sdvo.c | 5 +++--
> 7 files changed, 19 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
> index b5b1b9b..e2e39e6 100644
> --- a/drivers/gpu/drm/i915/intel_crt.c
> +++ b/drivers/gpu/drm/i915/intel_crt.c
> @@ -222,8 +222,9 @@ static void intel_crt_dpms(struct drm_connector *connector, int mode)
> intel_modeset_check_state(connector->dev);
> }
>
> -static int intel_crt_mode_valid(struct drm_connector *connector,
> - struct drm_display_mode *mode)
> +static enum drm_mode_status
> +intel_crt_mode_valid(struct drm_connector *connector,
> + struct drm_display_mode *mode)
> {
> struct drm_device *dev = connector->dev;
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index c36a227..7c54f62 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -142,7 +142,7 @@ intel_dp_max_data_rate(int max_link_clock, int max_lanes)
> return (max_link_clock * max_lanes * 8) / 10;
> }
>
> -static int
> +static enum drm_mode_status
> intel_dp_mode_valid(struct drm_connector *connector,
> struct drm_display_mode *mode)
> {
> diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
> index d257b09..7b9b350 100644
> --- a/drivers/gpu/drm/i915/intel_dsi.c
> +++ b/drivers/gpu/drm/i915/intel_dsi.c
> @@ -251,8 +251,9 @@ static void intel_dsi_get_config(struct intel_encoder *encoder,
> /* XXX: read flags, set to adjusted_mode */
> }
>
> -static int intel_dsi_mode_valid(struct drm_connector *connector,
> - struct drm_display_mode *mode)
> +static enum drm_mode_status
> +intel_dsi_mode_valid(struct drm_connector *connector,
> + struct drm_display_mode *mode)
> {
> struct intel_connector *intel_connector = to_intel_connector(connector);
> struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;
> diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
> index 3c77365..eeff998 100644
> --- a/drivers/gpu/drm/i915/intel_dvo.c
> +++ b/drivers/gpu/drm/i915/intel_dvo.c
> @@ -234,8 +234,9 @@ static void intel_dvo_dpms(struct drm_connector *connector, int mode)
> intel_modeset_check_state(connector->dev);
> }
>
> -static int intel_dvo_mode_valid(struct drm_connector *connector,
> - struct drm_display_mode *mode)
> +static enum drm_mode_status
> +intel_dvo_mode_valid(struct drm_connector *connector,
> + struct drm_display_mode *mode)
> {
> struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
>
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index d0c81b1..6a6ad0c 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -853,8 +853,9 @@ static int hdmi_portclock_limit(struct intel_hdmi *hdmi)
> return 225000;
> }
>
> -static int intel_hdmi_mode_valid(struct drm_connector *connector,
> - struct drm_display_mode *mode)
> +static enum drm_mode_status
> +intel_hdmi_mode_valid(struct drm_connector *connector,
> + struct drm_display_mode *mode)
> {
> if (mode->clock > hdmi_portclock_limit(intel_attached_hdmi(connector)))
> return MODE_CLOCK_HIGH;
> diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> index c3b4da7..3deb58e 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -256,8 +256,9 @@ static void intel_disable_lvds(struct intel_encoder *encoder)
> POSTING_READ(lvds_encoder->reg);
> }
>
> -static int intel_lvds_mode_valid(struct drm_connector *connector,
> - struct drm_display_mode *mode)
> +static enum drm_mode_status
> +intel_lvds_mode_valid(struct drm_connector *connector,
> + struct drm_display_mode *mode)
> {
> struct intel_connector *intel_connector = to_intel_connector(connector);
> struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;
> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> index e4f9918..2abeab0 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -1536,8 +1536,9 @@ static void intel_sdvo_dpms(struct drm_connector *connector, int mode)
> intel_modeset_check_state(connector->dev);
> }
>
> -static int intel_sdvo_mode_valid(struct drm_connector *connector,
> - struct drm_display_mode *mode)
> +static enum drm_mode_status
> +intel_sdvo_mode_valid(struct drm_connector *connector,
> + struct drm_display_mode *mode)
> {
> struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector);
>
> --
> 1.8.3.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drm/i915: Return a drm_mode_status enum in the mode_valid vfuncs
2013-11-28 15:49 ` Daniel Vetter
@ 2013-12-02 13:42 ` Thierry Reding
0 siblings, 0 replies; 5+ messages in thread
From: Thierry Reding @ 2013-12-02 13:42 UTC (permalink / raw)
To: Daniel Vetter; +Cc: intel-gfx, dri-devel
[-- Attachment #1.1: Type: text/plain, Size: 943 bytes --]
On Thu, Nov 28, 2013 at 04:49:52PM +0100, Daniel Vetter wrote:
> On Thu, Nov 28, 2013 at 03:29:18PM +0000, Damien Lespiau wrote:
> > We had some mode_valid() vfuncs returning an int, others the enum. Let's
> > use the latter everywhere.
> >
> > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
>
> Yeah, makes sense. Queued for -next, thanks for the patch.
>
> -Daniel
> > ---
> > drivers/gpu/drm/i915/intel_crt.c | 5 +++--
> > drivers/gpu/drm/i915/intel_dp.c | 2 +-
> > drivers/gpu/drm/i915/intel_dsi.c | 5 +++--
> > drivers/gpu/drm/i915/intel_dvo.c | 5 +++--
> > drivers/gpu/drm/i915/intel_hdmi.c | 5 +++--
> > drivers/gpu/drm/i915/intel_lvds.c | 5 +++--
> > drivers/gpu/drm/i915/intel_sdvo.c | 5 +++--
> > 7 files changed, 19 insertions(+), 13 deletions(-)
Shouldn't you be updating all other drivers as well? GCC doesn't seem to
complain about it, but it's still an inconsistency.
Thierry
[-- Attachment #1.2: Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-12-02 13:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-28 15:29 [PATCH 1/2] drm: Make the connector mode_valid() vfunc return a drm_mode_status enum Damien Lespiau
2013-11-28 15:29 ` [PATCH 2/2] drm/i915: Return a drm_mode_status enum in the mode_valid vfuncs Damien Lespiau
2013-11-28 15:49 ` Daniel Vetter
2013-12-02 13:42 ` Thierry Reding
2013-11-28 15:49 ` [PATCH 1/2] drm: Make the connector mode_valid() vfunc return a drm_mode_status enum Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox