On Mon, Jan 14, 2013 at 04:57:56PM +0200, Ville Syrj?l? wrote: > On Mon, Jan 14, 2013 at 03:30:28PM +0100, Thierry Reding wrote: > > The same function had already been merged with a different name. Remove > > the duplicate one but reuse some of its kerneldoc fragments for the > > existing implementation. > > And I just used that function. Oh well ;) > > Personally I would have kept the other function instead since it has a > more descriptive name, but I can't be bothered to care enough to > complain too much.
drm_mode_cea_vic() was introduced later, so I preferred the older variant. > The patch could be moved to the beginning of the series, so it can be > merged w/o being blocked by the more invasive stuff. Well, assuming that > the more invasive stuff still needs discussing. I had it at the beginning of the series, then realized that I hadn't updated the i915 driver properly. So I cheated a bit and just moved the patch instead of updating i915 and then resolving the conflict in the subsequent i915 HDMI helper patch. =) If the series can't be merged as-is, I can work this in for the next version. Thierry -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: not available URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20130114/283e109d/attachment.pgp>