Question on git merge patch

[Huang, FrankR]

> -----Original Message-----
> From: Michel Dänzer [mailto:michel at daenzer.net]
> Sent: 2011年10月12日 18:32
> To: Huang, FrankR
> Cc: xorg-driver-ati at lists.x.org
> Subject: RE: Question on git merge patch
> 
> On Mit, 2011-10-12 at 18:05 +0800, Huang, FrankR wrote:
> > > From: Michel Dänzer [mailto:michel at daenzer.net]
> > > On Mit, 2011-10-12 at 17:08 +0800, Huang, FrankR wrote:
> > > >
> > > > From its content, it will do some modification to functions like
> > > > evergreen_irq_ack(). Actually right now I am developing graphics
> > > > driver under wec7 and use linux graphics driver as the reference. I
> > > > want to know how to use this patch.
> > >
> > > From gitk, I think you probably mean commit
> > > 6f34be50bd1bdd2ff3c955940e033a80d05f248a ('drm/radeon/kms: add
> pageflip
> > > ioctl support (v3)').
> > Yup! I mean this patch. How do you find this patch? I have not used
> > gitk before. You use it to find this patch?
> 
> Yes. I recommend getting familiar with gitk (or another similar tool),
> its UI is unintuitive but highly functional.
Thanks, Michel. I have installed that UI tool in my linux disk. It looks great. Very easy to use it by start. Before I used web page to see the diff information. Right now this tool will replace.

> 
> > It seems that Alex submitted this patch to dri-devel mail list. Right?
> > Actually I am not sure what is this patch is used for. Why Alex submit
> > this big patch here? Why not xorg-driver-ati mail list? :)
> 
> Kernel DRM patches are submitted to the dri-devel list, and usually only
> discussed there.
Okay. Before I only subscribed xorg-driver-ati mail list. Seems sometimes, besides ddx driver, it also talks on kms driver. So if I want to submit s question on KMS driver, where is the best place to discuss it?
> 
> 
> > > > As you said, drm-radeon-fusion should be a part of drm-radeon-next.
> > > > Then drm-radeon-next will be merged into drm-core-next?
> > > > The log shows: "Merge branch 'drm-radeon-fusion' of ../drm-radeon-
> next
> > > > into drm-core-next",
> > >
> > > Oops sorry, I meant 'drm-core-next' when I said 'drm-radeon-next'.
> > >
> > > > So what's the relationship between drm-core-next and master?
> > >
> > > By master, do you mean Linus' tree? Dave Airlie regularly asks Linus
> to
> > > merge DRM changes into his tree, and he usually complies. E.g. the
> > > changes you're referring to were merged by Linus for 2.6.38-rc1 in
> > > commit 5b2eef966cb2ae307aa4ef1767f7307774bc96ca on January 11th AFAICT
> > > from gitk.
> > Okay. Got it. So for some branches(like drm-radeon-next,
> > drm-radeon-fusion), what are those branches used for?
> 
> As you mentioned before, drm-radeon-fusion was probably just a local
> branch for the initial Fusion support. Otherwise, the *-next branches
> are generally for changes for the next kernel merge window, whereas
> *-fixes branches are generally for fixes for the current kernel cycle.
Got it. Alex gave me a detailed description on that. Right now I have used gitk tool to look every patch in detail and apply it to my CE graphics driver.

> 
> 
> --
> Earthling Michel Dänzer           |                   http://www.amd.com
> Libre software enthusiast         |          Debian, X and DRI developer