| Message ID | 1443599103-26317-1-git-send-email-tiwai@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Sep 30, 2015 at 09:45:03AM +0200, Takashi Iwai wrote: > The lack of const leads to a compile warning after merging i915 > upstream tree: > drivers/gpu/drm/i915/intel_audio.c:147:13: note: expected 'struct drm_display_mode *' but argument is of type 'const struct drm_display_mode *' > > Reported-by: kbuild test robot <fengguang.wu@intel.com> > Signed-off-by: Takashi Iwai <tiwai@suse.de> Yup, I have that in my merge resolution in drm-intel-nightly when pull in your sound tree. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Atm I don't see a need for another merge on my side, I'll ping you when that happens. So probably simplest to apply this to the sound tree. Cheers, Daniel > --- > drivers/gpu/drm/i915/intel_audio.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c > index 30f6859dcb36..dffd0b4c5f17 100644 > --- a/drivers/gpu/drm/i915/intel_audio.c > +++ b/drivers/gpu/drm/i915/intel_audio.c > @@ -144,7 +144,7 @@ static uint32_t audio_config_setup_n_reg(int n, uint32_t val) > > /* check whether N/CTS/M need be set manually */ > static bool audio_rate_need_prog(struct intel_crtc *crtc, > - struct drm_display_mode *mode) > + const struct drm_display_mode *mode) > { > if (((mode->clock == TMDS_297M) || > (mode->clock == TMDS_296M)) && > -- > 2.5.3 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Wed, 30 Sep 2015 14:31:31 +0200, Daniel Vetter wrote: > > On Wed, Sep 30, 2015 at 09:45:03AM +0200, Takashi Iwai wrote: > > The lack of const leads to a compile warning after merging i915 > > upstream tree: > > drivers/gpu/drm/i915/intel_audio.c:147:13: note: expected 'struct drm_display_mode *' but argument is of type 'const struct drm_display_mode *' > > > > Reported-by: kbuild test robot <fengguang.wu@intel.com> > > Signed-off-by: Takashi Iwai <tiwai@suse.de> > > Yup, I have that in my merge resolution in drm-intel-nightly when pull in > your sound tree. > > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > Atm I don't see a need for another merge on my side, I'll ping you when > that happens. So probably simplest to apply this to the sound tree. OK, done. thanks, Takashi
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c index 30f6859dcb36..dffd0b4c5f17 100644 --- a/drivers/gpu/drm/i915/intel_audio.c +++ b/drivers/gpu/drm/i915/intel_audio.c @@ -144,7 +144,7 @@ static uint32_t audio_config_setup_n_reg(int n, uint32_t val) /* check whether N/CTS/M need be set manually */ static bool audio_rate_need_prog(struct intel_crtc *crtc, - struct drm_display_mode *mode) + const struct drm_display_mode *mode) { if (((mode->clock == TMDS_297M) || (mode->clock == TMDS_296M)) &&
The lack of const leads to a compile warning after merging i915 upstream tree: drivers/gpu/drm/i915/intel_audio.c:147:13: note: expected 'struct drm_display_mode *' but argument is of type 'const struct drm_display_mode *' Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> --- drivers/gpu/drm/i915/intel_audio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)