On Fri, 04 Dec 2015 17:49:43 +0100, Daniel Vetter wrote: > > On Fri, Dec 04, 2015 at 05:27:12PM +0100, Takashi Iwai wrote: > > On Fri, 04 Dec 2015 17:20:15 +0100, > > Takashi Iwai wrote: > > > > > > On Fri, 04 Dec 2015 17:15:59 +0100, > > > Daniel Vetter wrote: > > > > > > > > On Fri, Dec 04, 2015 at 05:03:55PM +0100, Takashi Iwai wrote: > > > > > On Fri, 04 Dec 2015 16:54:32 +0100, > > > > > Daniel Vetter wrote: > > > > > > > > > > > > On Fri, Dec 04, 2015 at 04:15:24PM +0100, Takashi Iwai wrote: > > > > > > > diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h > > > > > > > index 30d89e0da2c6..058d39e8d57f 100644 > > > > > > > --- a/include/drm/i915_component.h > > > > > > > +++ b/include/drm/i915_component.h > > > > > > > @@ -38,6 +38,7 @@ > > > > > > > * @codec_wake_override: Enable/Disable generating the codec wake signal > > > > > > > * @get_cdclk_freq: get the Core Display Clock in KHz > > > > > > > * @sync_audio_rate: set n/cts based on the sample rate > > > > > > > + * @get_eld: fill the audio state and ELD bytes for the given port > > > > > > > > > > > > One more: You seem to still be on an old baseline, with switched to the > > > > > > new in-line comment layout. That allows you to spec the callback semantics > > > > > > in much more detail since it allows real paragraphs. > > > > > > > > > > Yes, I've been waiting for your (or Dave's) answer to my previous > > > > > question: which branch can I use as a solid base? > > > > > > > > Ooops sorry. drm-next is now open and has everything you need. > > > > > > > > git://people.freedesktop.org/~airlied/linux drm-next > > > > > > Thanks, I'll rebase on it. > > > > Hmm, this branch gives a compile warning: > > > > drivers/gpu/drm/i915/intel_display.c:5217:0: warning: "for_each_power_domain" redefined > > #define for_each_power_domain(domain, mask) \ > > ^ > > In file included from drivers/gpu/drm/i915/intel_drv.h:32:0, > > from drivers/gpu/drm/i915/intel_display.c:36: > > drivers/gpu/drm/i915/i915_drv.h:312:0: note: this is the location of the previous definition > > #define for_each_power_domain(domain, mask) \ > > ^ > > LD [M] drivers/gpu/drm/i915/i915.o > > Hilarious merge fail on my side, the patch to fix it up is queued in > drm-intel.git. I'll send a pull request for that to Dave end of next week > or so. Alright. Meanwhile I rebased the patchset, and it's enough for review, at least. I can rebase again at the final merge time to the fixed branch. thanks, Takashi _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
