* [PATCH 1/3] drm: Make some modes const when iterating through them
@ 2015-09-07 15:22 ville.syrjala
2015-09-07 15:22 ` [PATCH 2/3] drm: Remove the 'mode' argument from drm_select_eld() ville.syrjala
2015-09-07 15:22 ` [PATCH 3/3] drm: Make drm_av_sync_delay() 'mode' argument const ville.syrjala
0 siblings, 2 replies; 5+ messages in thread
From: ville.syrjala @ 2015-09-07 15:22 UTC (permalink / raw)
To: dri-devel; +Cc: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
valid_inferred_mode() don't change the modes over which it iterates,
so make the iterator const.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/drm_edid.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 05bb731..9afb1fc 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -2044,7 +2044,7 @@ mode_in_range(const struct drm_display_mode *mode, struct edid *edid,
static bool valid_inferred_mode(const struct drm_connector *connector,
const struct drm_display_mode *mode)
{
- struct drm_display_mode *m;
+ const struct drm_display_mode *m;
bool ok = false;
list_for_each_entry(m, &connector->probed_modes, head) {
--
2.4.6
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] drm: Remove the 'mode' argument from drm_select_eld()
2015-09-07 15:22 [PATCH 1/3] drm: Make some modes const when iterating through them ville.syrjala
@ 2015-09-07 15:22 ` ville.syrjala
2015-09-07 15:22 ` [PATCH 3/3] drm: Make drm_av_sync_delay() 'mode' argument const ville.syrjala
1 sibling, 0 replies; 5+ messages in thread
From: ville.syrjala @ 2015-09-07 15:22 UTC (permalink / raw)
To: dri-devel; +Cc: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
drm_select_eld() doesn't look at the passed in mode, so don't pass it
in.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/drm_edid.c | 4 +---
drivers/gpu/drm/i915/intel_audio.c | 2 +-
include/drm/drm_edid.h | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 9afb1fc..e32218f 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -3396,7 +3396,6 @@ EXPORT_SYMBOL(drm_av_sync_delay);
/**
* drm_select_eld - select one ELD from multiple HDMI/DP sinks
* @encoder: the encoder just changed display mode
- * @mode: the adjusted display mode
*
* It's possible for one encoder to be associated with multiple HDMI/DP sinks.
* The policy is now hard coded to simply use the first HDMI/DP sink's ELD.
@@ -3404,8 +3403,7 @@ EXPORT_SYMBOL(drm_av_sync_delay);
* Return: The connector associated with the first HDMI/DP sink that has ELD
* attached to it.
*/
-struct drm_connector *drm_select_eld(struct drm_encoder *encoder,
- struct drm_display_mode *mode)
+struct drm_connector *drm_select_eld(struct drm_encoder *encoder)
{
struct drm_connector *connector;
struct drm_device *dev = encoder->dev;
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 89c1a8ce..f73de0b 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -404,7 +404,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)
struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
enum port port = intel_dig_port->port;
- connector = drm_select_eld(encoder, mode);
+ connector = drm_select_eld(encoder);
if (!connector)
return;
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index 53c53c4..31528d9 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -327,8 +327,7 @@ int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads);
int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb);
int drm_av_sync_delay(struct drm_connector *connector,
struct drm_display_mode *mode);
-struct drm_connector *drm_select_eld(struct drm_encoder *encoder,
- struct drm_display_mode *mode);
+struct drm_connector *drm_select_eld(struct drm_encoder *encoder);
int drm_load_edid_firmware(struct drm_connector *connector);
int
--
2.4.6
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] drm: Make drm_av_sync_delay() 'mode' argument const
2015-09-07 15:22 [PATCH 1/3] drm: Make some modes const when iterating through them ville.syrjala
2015-09-07 15:22 ` [PATCH 2/3] drm: Remove the 'mode' argument from drm_select_eld() ville.syrjala
@ 2015-09-07 15:22 ` ville.syrjala
2015-09-09 12:45 ` Alex Deucher
1 sibling, 1 reply; 5+ messages in thread
From: ville.syrjala @ 2015-09-07 15:22 UTC (permalink / raw)
To: dri-devel; +Cc: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
drm_av_sync_delay() doesn't change the passed in mode, so make it const.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/drm_edid.c | 2 +-
include/drm/drm_edid.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index e32218f..d895556 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -3361,7 +3361,7 @@ EXPORT_SYMBOL(drm_edid_to_speaker_allocation);
* the sink doesn't support audio or video.
*/
int drm_av_sync_delay(struct drm_connector *connector,
- struct drm_display_mode *mode)
+ const struct drm_display_mode *mode)
{
int i = !!(mode->flags & DRM_MODE_FLAG_INTERLACE);
int a, v;
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index 31528d9..2af9769 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -326,7 +326,7 @@ void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid);
int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads);
int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb);
int drm_av_sync_delay(struct drm_connector *connector,
- struct drm_display_mode *mode);
+ const struct drm_display_mode *mode);
struct drm_connector *drm_select_eld(struct drm_encoder *encoder);
int drm_load_edid_firmware(struct drm_connector *connector);
--
2.4.6
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 3/3] drm: Make drm_av_sync_delay() 'mode' argument const
2015-09-07 15:22 ` [PATCH 3/3] drm: Make drm_av_sync_delay() 'mode' argument const ville.syrjala
@ 2015-09-09 12:45 ` Alex Deucher
2015-09-09 12:54 ` [Intel-gfx] " Daniel Vetter
0 siblings, 1 reply; 5+ messages in thread
From: Alex Deucher @ 2015-09-09 12:45 UTC (permalink / raw)
To: Ville Syrjälä
Cc: Intel Graphics Development, Maling list - DRI developers
On Mon, Sep 7, 2015 at 11:22 AM, <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> drm_av_sync_delay() doesn't change the passed in mode, so make it const.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
For the series:
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/drm_edid.c | 2 +-
> include/drm/drm_edid.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index e32218f..d895556 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -3361,7 +3361,7 @@ EXPORT_SYMBOL(drm_edid_to_speaker_allocation);
> * the sink doesn't support audio or video.
> */
> int drm_av_sync_delay(struct drm_connector *connector,
> - struct drm_display_mode *mode)
> + const struct drm_display_mode *mode)
> {
> int i = !!(mode->flags & DRM_MODE_FLAG_INTERLACE);
> int a, v;
> diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
> index 31528d9..2af9769 100644
> --- a/include/drm/drm_edid.h
> +++ b/include/drm/drm_edid.h
> @@ -326,7 +326,7 @@ void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid);
> int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads);
> int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb);
> int drm_av_sync_delay(struct drm_connector *connector,
> - struct drm_display_mode *mode);
> + const struct drm_display_mode *mode);
> struct drm_connector *drm_select_eld(struct drm_encoder *encoder);
> int drm_load_edid_firmware(struct drm_connector *connector);
>
> --
> 2.4.6
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Intel-gfx] [PATCH 3/3] drm: Make drm_av_sync_delay() 'mode' argument const
2015-09-09 12:45 ` Alex Deucher
@ 2015-09-09 12:54 ` Daniel Vetter
0 siblings, 0 replies; 5+ messages in thread
From: Daniel Vetter @ 2015-09-09 12:54 UTC (permalink / raw)
To: Alex Deucher; +Cc: Intel Graphics Development, Maling list - DRI developers
On Wed, Sep 09, 2015 at 08:45:14AM -0400, Alex Deucher wrote:
> On Mon, Sep 7, 2015 at 11:22 AM, <ville.syrjala@linux.intel.com> wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > drm_av_sync_delay() doesn't change the passed in mode, so make it const.
> >
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> For the series:
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Applied to drm-misc, thanks for patches&review.
-Daniel
>
> > ---
> > drivers/gpu/drm/drm_edid.c | 2 +-
> > include/drm/drm_edid.h | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> > index e32218f..d895556 100644
> > --- a/drivers/gpu/drm/drm_edid.c
> > +++ b/drivers/gpu/drm/drm_edid.c
> > @@ -3361,7 +3361,7 @@ EXPORT_SYMBOL(drm_edid_to_speaker_allocation);
> > * the sink doesn't support audio or video.
> > */
> > int drm_av_sync_delay(struct drm_connector *connector,
> > - struct drm_display_mode *mode)
> > + const struct drm_display_mode *mode)
> > {
> > int i = !!(mode->flags & DRM_MODE_FLAG_INTERLACE);
> > int a, v;
> > diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
> > index 31528d9..2af9769 100644
> > --- a/include/drm/drm_edid.h
> > +++ b/include/drm/drm_edid.h
> > @@ -326,7 +326,7 @@ void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid);
> > int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads);
> > int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb);
> > int drm_av_sync_delay(struct drm_connector *connector,
> > - struct drm_display_mode *mode);
> > + const struct drm_display_mode *mode);
> > struct drm_connector *drm_select_eld(struct drm_encoder *encoder);
> > int drm_load_edid_firmware(struct drm_connector *connector);
> >
> > --
> > 2.4.6
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/dri-devel
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
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:[~2015-09-09 12:54 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-07 15:22 [PATCH 1/3] drm: Make some modes const when iterating through them ville.syrjala
2015-09-07 15:22 ` [PATCH 2/3] drm: Remove the 'mode' argument from drm_select_eld() ville.syrjala
2015-09-07 15:22 ` [PATCH 3/3] drm: Make drm_av_sync_delay() 'mode' argument const ville.syrjala
2015-09-09 12:45 ` Alex Deucher
2015-09-09 12:54 ` [Intel-gfx] " Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox