[Dri-devel] Re: linux-drm-4.2.0-kernelsource.tar.gz fixes for 2.5.X

[Jens O. <je...@tu...>]

Jos=E9 Fonseca wrote:
>=20
> Jens,
>=20
> On 2002.05.13 14:58 Jens Owen wrote:
> > Jose,
> >
> > I recommend a full two way merge (DRI->kernel and kernel->DRI).  The
> > kernel->DRI changes can be submitted directly to our repository for
> > testing.  The DRI->kernel changes require a patch be submitted to the
> > kernel team.  If we need two patches (for 2.4 and 2.5) that's okay--b=
ut
> > we should try to end up with a common driver source for both kernel
> > versions in our repository, if at all possible.  Posting these patche=
s
> > on the DRI site is for the purpose of getting some alpha testing
> > exposure and code review before submitting to the kernel team.
> >
> > Once we have merged sources in both repositories, then David and Alan
> > can pick up the latest from our repository.
> >
> > Getting these fixes out minimizes our need to create patches relative=
 to
> > all the verious places the kernel DRM drivers can be found.
>=20
> I agree entirely with you.
>=20
> >
> > Does this plan cover our needs, or am I overlooking something?
> >
>=20
> Nop, but who will do this? (I can't volunteer as I have no more spare t=
ime
> until June.)

Mike Mestnik has created this initial patch for testing.  I hope Mike
has the time to see this into kernel integration, but we need to make
sure we're giving Mike consistent feedback so he's not doing extranious
work--that's the intent of laying out a plan.

> I would be nice to know what is the current state of affairs? Is it lik=
e:
>=20
>   - both 2.4.x 2.5.x linux kernel series have the XFree 4.1.0 DRMs (wit=
h
> changes by the linux kernel developers to match the rest of the kernel).

Nothing that clean.  The r128 driver appears to be something from
slightly after 4.1.0.  I haven't looked at any of the others.

>   - the XFree86 4.2.0 tree has DRM source for early 2.4.x series
>     - for 2.4.18 changes are required, for which Mike made a patch

I don't know of any kernel driver interface changes that we need.  There
are some patches to drivers in the kernel repository that we need to
propegate back into ours; however, the bulk of the work is getting our
DRM enhancement to the kernel team.

>     - for 2.5.x likewise, for which Micah patched the radeon kernel onl=
y

As of 2.5.9 the r128 driver looked identical to the 2.4.17 r128 driver.=20
If we can keep the source for converged between these two branches, that
would be ideal.
=20
> And what is necessary to do is:
>=20
>   - adapt the DRI CVS kernel modules to build in at least three kernel
> versions,

The latest 2.4 and latest 2.5 would be good since we're merging--what
was the third version you had in mind?

>   - make a patch against the latest 2.4.x and 2.5.x kernels
>=20
> Is this picture correct?

It's a decent start:-)

--                             /\
         Jens Owen            /  \/\ _   =20
  je...@tu...  /    \ \ \   Steamboat Springs, Colorado