apple-gmux: Add initial documentation

Well, it's built around the asciidoc patch, which isn't in the mainline at this point. Should things go a different direction, that could force some changes here;

Quoted 3 lines · Jonathan Corbet

Well, it's built around the asciidoc patch, which isn't in the mainline at this point. Should things go a different direction, that could force some changes here;

If/when that happens, I'll be happy to fixup the documentation as needed. In fact I originally wrote this in markdown in November, then converted it to asciidoc in December and that really wasn't a big deal.

The need for asciidoc arises from the desire to not clutter up the prose text with URLs. To achieve this, asciidoc allows defining so-called "attribute entries" which may then be referenced in the text:
http://asciidoc.org/userguide.html#X62

Markdown has a similar feature called "reference style links", the difference being that they can be defined anywhere in the document, whereas asciidoc's "attribute entries" must precede their usage in the text:
https://daringfireball.net/projects/markdown/syntax#link

Here's a v2, the only change is Bruno Pr?mont's addition to the commit message.

@Daniel Vetter: Could you pick this up for topic/drm-misc please?

An ack for drivers/platform/x86 was kindly provided by Darren Hart with:
Message-ID: <[email protected]>

Link http://lists.freedesktop.org/archives/dri-devel/2016-January/097918.html

Thanks everyone!

Lukas Wunner (1):
apple-gmux: Add initial documentation

 Documentation/DocBook/gpu.tmpl    |  22 ++++++++
 drivers/platform/x86/apple-gmux.c | 113 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 135 insertions(+)

Signature · 1 line

1.8.5.2 (Apple Git-48)

Quoted 4 lines · Lukas Wunner

Here's a v2, the only change is Bruno Pr?mont's addition to the commit message.

@Daniel Vetter: Could you pick this up for topic/drm-misc please?

I think it makes more sense to pull this in through Darren's tree, and I acked that on the last round already.

Hi Daniel,

Quoted 8 lines · Daniel Vetter

Quoted 4 lines · Lukas Wunner

Here's a v2, the only change is Bruno Pr?mont's addition to the commit message.

@Daniel Vetter: Could you pick this up for topic/drm-misc please?

I think it makes more sense to pull this in through Darren's tree, and I acked that on the last round already.

As I've written in the cover letter of v1, this will provoke merge conflicts going forward since I'll post a new version of my GPU switching patches for the MacBook Pro this week which also touch apple-gmux and are based on this docs patch.

I guess alternatively the patches touching vga_switcheroo and the DRM drivers could go in via pdx86, I'll cross-post to both lists to keep this option open, though I expect this might also lead to merge conflicts if relevant portions of the DRM drivers are changed in drm-next for 4.6.

I still believe merging this via drm-next or drm-intel/topic/drm-misc would be the option least prone to merge conflicts.

Quoted 21 lines · Lukas Wunner

Quoted 3 lines · Jonathan Corbet

Well, it's built around the asciidoc patch, which isn't in the mainline at this point. Should things go a different direction, that could force some changes here;

If/when that happens, I'll be happy to fixup the documentation as needed. In fact I originally wrote this in markdown in November, then converted it to asciidoc in December and that really wasn't a big deal.

The need for asciidoc arises from the desire to not clutter up the prose text with URLs. To achieve this, asciidoc allows defining so-called "attribute entries" which may then be referenced in the text:
http://asciidoc.org/userguide.html#X62

Markdown has a similar feature called "reference style links", the difference being that they can be defined anywhere in the document, whereas asciidoc's "attribute entries" must precede their usage in the text:
https://daringfireball.net/projects/markdown/syntax#link

Quoted 4 lines

Here's a v2, the only change is Bruno Pr?mont's addition to the commit message.

@Daniel Vetter: Could you pick this up for topic/drm-misc please?

I think it makes more sense to pull this in through Darren's tree, and I acked that on the last round already.

Quoted 22 lines · Daniel Vetter

Quoted 21 lines · Lukas Wunner

Quoted 3 lines · Jonathan Corbet

Well, it's built around the asciidoc patch, which isn't in the mainline at this point. Should things go a different direction, that could force some changes here;

If/when that happens, I'll be happy to fixup the documentation as needed. In fact I originally wrote this in markdown in November, then converted it to asciidoc in December and that really wasn't a big deal.

The need for asciidoc arises from the desire to not clutter up the prose text with URLs. To achieve this, asciidoc allows defining so-called "attribute entries" which may then be referenced in the text:
http://asciidoc.org/userguide.html#X62

Markdown has a similar feature called "reference style links", the difference being that they can be defined anywhere in the document, whereas asciidoc's "attribute entries" must precede their usage in the text:
https://daringfireball.net/projects/markdown/syntax#link

Quoted 7 lines

Quoted 4 lines

Here's a v2, the only change is Bruno Pr?mont's addition to the commit message.

@Daniel Vetter: Could you pick this up for topic/drm-misc please?

I think it makes more sense to pull this in through Darren's tree, and I acked that on the last round already.

OK, I'm happy to take it. Lukas, this doesn't apply cleanly to my 4.4-rc* based for-next branch or Linus's 4.4 from yesterday. I can manually apply it:

$ patch -p1 < ~/incoming/PATCH_v2_1-1_apple-gmux_Add_initial_documentation.mbox 
patching file Documentation/DocBook/gpu.tmpl
Hunk #1 succeeded at 4279 with fuzz 1 (offset 809 lines).
patching file drivers/platform/x86/apple-gmux.c

But that is one hell of an offset. What are you developing against and can you send me something that applies cleanly?

Hi Darren,

Quoted 34 lines · Darren Hart

Quoted 22 lines · Daniel Vetter

Quoted 21 lines · Lukas Wunner

Quoted 3 lines · Jonathan Corbet

Well, it's built around the asciidoc patch, which isn't in the mainline at this point. Should things go a different direction, that could force some changes here;

If/when that happens, I'll be happy to fixup the documentation as needed. In fact I originally wrote this in markdown in November, then converted it to asciidoc in December and that really wasn't a big deal.

The need for asciidoc arises from the desire to not clutter up the prose text with URLs. To achieve this, asciidoc allows defining so-called "attribute entries" which may then be referenced in the text:
http://asciidoc.org/userguide.html#X62

Markdown has a similar feature called "reference style links", the difference being that they can be defined anywhere in the document, whereas asciidoc's "attribute entries" must precede their usage in the text:
https://daringfireball.net/projects/markdown/syntax#link

Quoted 7 lines

Quoted 4 lines

Here's a v2, the only change is Bruno Pr?mont's addition to the commit message.

@Daniel Vetter: Could you pick this up for topic/drm-misc please?

I think it makes more sense to pull this in through Darren's tree, and I acked that on the last round already.

OK, I'm happy to take it. Lukas, this doesn't apply cleanly to my 4.4-rc* based for-next branch or Linus's 4.4 from yesterday. I can manually apply it:

Quoted 7 lines

$ patch -p1 < ~/incoming/PATCH_v2_1-1_apple-gmux_Add_initial_documentation.mbox 
patching file Documentation/DocBook/gpu.tmpl
Hunk #1 succeeded at 4279 with fuzz 1 (offset 809 lines).
patching file drivers/platform/x86/apple-gmux.c

But that is one hell of an offset. What are you developing against and can you send me something that applies cleanly?

I'm developing against drm-next and/or drm-intel-nightly. Looks like gpu.tmpl is touched very frequently. :-)

As for the apple-gmux documentation, Daniel picked it up this afternoon:
http://cgit.freedesktop.org/drm-intel/commit/?h=topic/drm-misc&id=3d7b75fdae9c81dd71c7573dbc285af90e0924fa

So, everything's fine. Thanks a lot though for being such a responsive and speedy maintainer, much appreciated!