| Message ID | 20160704131651.1083630-1-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show |
On Mon, Jul 04, 2016 at 03:16:51PM +0200, Arnd Bergmann wrote: > This follows the API change, adding the extra function arguments. > I suppose we want this to be part of the ASoC merge in linux-next > for now too. I sent a pull request for the API change to the DRM people which might be easier given that it's a single commit topic branch rather than the whole of DRM.
Acked-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> 2016-07-04 15:22 GMT+02:00 Mark Brown <broonie@kernel.org>: > On Mon, Jul 04, 2016 at 03:16:51PM +0200, Arnd Bergmann wrote: > > > This follows the API change, adding the extra function arguments. > > I suppose we want this to be part of the ASoC merge in linux-next > > for now too. > > I sent a pull request for the API change to the DRM people which might > be easier given that it's a single commit topic branch rather than the > whole of DRM. > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > -- Benjamin Gaignard Graphic Working Group Linaro.org <http://www.linaro.org/> *│ *Open source software for ARM SoCs Follow *Linaro: *Facebook <http://www.facebook.com/pages/Linaro> | Twitter <http://twitter.com/#!/linaroorg> | Blog <http://www.linaro.org/linaro-blog/>
On Mon, Jul 04, 2016 at 03:36:57PM +0200, Arnd Bergmann wrote: > On Monday, July 4, 2016 3:22:30 PM CEST Mark Brown wrote: > > I sent a pull request for the API change to the DRM people which might > > be easier given that it's a single commit topic branch rather than the > > whole of DRM. > Agreed, that is probably the best way forward. Does your pull request > also contain an equivalent of my two patches? No, I just sent a pull request for the API change - I don't have the new patches in my tree.
On 5 July 2016 at 09:46, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Hi Dave, > > On Mon, 4 Jul 2016 15:38:10 +0200 Mark Brown <broonie@kernel.org> wrote: >> >> On Mon, Jul 04, 2016 at 03:36:57PM +0200, Arnd Bergmann wrote: >> > On Monday, July 4, 2016 3:22:30 PM CEST Mark Brown wrote: >> >> > > I sent a pull request for the API change to the DRM people which might >> > > be easier given that it's a single commit topic branch rather than the >> > > whole of DRM. >> >> > Agreed, that is probably the best way forward. Does your pull request >> > also contain an equivalent of my two patches? >> >> No, I just sent a pull request for the API change - I don't have the new >> patches in my tree. > > So to be very clear, what you would need to do is merge the one commit > branch that Mark sent you a pull request for: > > git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-hdmi-codec-pdata > > and as part of the merge commit (so e.g. "git apply <patch>; git commit > --amend" on top of the merge), add the two patches we are talking about: > > "drm: sti: fix prototypes after API change" > "drm: mediatek: fix prototypes after API change" > > Then any further conflicts can hopefully be fixed up as they appear in > your tree (if any). Or be avoided by people developing against your > tree. Thanks Stephen, I think I've done it correctly, I've just pushed out drm-next with the pull and the two changes amended into the merge. Dave.
Hi Dave, On Tue, 5 Jul 2016 09:59:16 +1000 Dave Airlie <airlied@gmail.com> wrote: > > I think I've done it correctly, I've just pushed out drm-next with the > pull and the > two changes amended into the merge. Looks great, thanks.
diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c index 927e2b2e5af2..fedc17f98d9b 100644 --- a/drivers/gpu/drm/sti/sti_hdmi.c +++ b/drivers/gpu/drm/sti/sti_hdmi.c @@ -1169,7 +1169,7 @@ static int hdmi_audio_configure(struct sti_hdmi *hdmi, return hdmi_audio_infoframe_config(hdmi); } -static void hdmi_audio_shutdown(struct device *dev) +static void hdmi_audio_shutdown(struct device *dev, void *data) { struct sti_hdmi *hdmi = dev_get_drvdata(dev); int audio_cfg; @@ -1186,6 +1186,7 @@ static void hdmi_audio_shutdown(struct device *dev) } static int hdmi_audio_hw_params(struct device *dev, + void *data, struct hdmi_codec_daifmt *daifmt, struct hdmi_codec_params *params) { @@ -1221,7 +1222,7 @@ static int hdmi_audio_hw_params(struct device *dev, return 0; } -static int hdmi_audio_digital_mute(struct device *dev, bool enable) +static int hdmi_audio_digital_mute(struct device *dev, void *data, bool enable) { struct sti_hdmi *hdmi = dev_get_drvdata(dev); @@ -1235,7 +1236,7 @@ static int hdmi_audio_digital_mute(struct device *dev, bool enable) return 0; } -static int hdmi_audio_get_eld(struct device *dev, uint8_t *buf, size_t len) +static int hdmi_audio_get_eld(struct device *dev, void *data, uint8_t *buf, size_t len) { struct sti_hdmi *hdmi = dev_get_drvdata(dev); struct drm_connector *connector = hdmi->drm_connector;
Like the mediatek hdmi driver, the sti driver now suffers from an API change in linux-next: drivers/gpu/drm/sti/sti_hdmi.c:1250:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] .hw_params = hdmi_audio_hw_params, ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/sti/sti_hdmi.c:1250:15: note: (near initialization for 'audio_codec_ops.hw_params') This follows the API change, adding the extra function arguments. I suppose we want this to be part of the ASoC merge in linux-next for now too. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: 2c348e505328 ("drm: sti: Add ASoC generic hdmi codec support.") Fixes: efc9194bcff8 ("ASoC: hdmi-codec: callback function will be called with private data") Link: https://lkml.org/lkml/2016/6/29/441 --- drivers/gpu/drm/sti/sti_hdmi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)