[Nouveau] [Bug 69203] [NVC1] Kernel 3.11 - Xorg hangs immediately after invocation

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=69203

--- Comment #6 from Alex <alupu01 at gmail.com> ---
> Can you try
 git checkout 5ee86c4190f9e
 git cherry-pick d2989b534ef6834ebf2425aecc040b894b567c91
> And run that kernel?

Hi Ilia,

[~/linux]$ git status
# On branch master
nothing to commit, working directory clean

[~/linux]$ git checkout 5ee86c4190f9e
Note: checking out '5ee86c4190f9e'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b new_branch_name

HEAD is now at 5ee86c41... drm/nve0-/gr: some new gpc registers can have
multiple copies

[~/linux]$ git cherry-pick d2989b534ef6834ebf2425aecc040b894b567c91
error: could not apply d2989b5... drm/nvc0/gr: fix gpc firmware regression
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
-------------------------------------------------------------------------------
BTW (this might shed some extra light):
Yesterday, before resubmitting the bug, I tried to apply the
a0b7ebfb39bf80078d12bd1a46ec40d0d0dbdeef
patches to 5ee (edited to fit the master configuration).
I called the new patch "M.patch" (for Maarten).
This is what I got:

[~/linux]$ patch -p1 < /root/patches/M.patch ; echo $?
patching file drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpc.fuc
Hunk #1 succeeded at 353 (offset 1 line).
patching file drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h
Hunk #1 FAILED at 400.
1 out of 1 hunk FAILED -- saving rejects to file
drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h.rej
1

so I gave up.
Caveat:  it's possible I may have messed up the patches (original and edited)
I'll attach them for your critique.

-- Alex

-- 
You are receiving this mail because:
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/nouveau/attachments/20130911/6d9f276d/attachment.html>