Now that the framebuffer device is queried, don't assume that the framebuffer device is /dev/fb0
- Group Reviewers
- R108:e737a6193c80: main_wayland: Don't hardcode /dev/fb0 anymore
Add /dev/fb1 to seat1, start kwin with the framebuffer backend on seat1, verify with the stdio/stderr output it selected /dev/fb1.
Make sure manual device selection still works
There is an issue right now where /dev/fb1 is all black, if it is both selected manually or automatically. I think I might need see if the VSCREENINFO or FSCREENINFO framebuffer settings are changing or something (I had to do something similar to this to Weston's fbdev backend as well)
If I do find a solution, I'll send one separate from this series
git checkout 50b948134c81 arc patch D9557 git rebase arcpatch-D9556 # might be arcpatch-D9556_1 or similar for you # Check if it still compiles arc diff
@graesslin Friendly ping to review the code afterwards ;)
Did you use the correct branch? Remember that depending on how much you fiddled around before, the other Diff might have a different branch name for you, e.g. arcpatch-D9556_2.
Please try again my steps outlined above (i.e. rebasing and setting the upstream), and please use a fresh checkout of the repo for that (i.e. re-issue git clone).
If that all does not help (e.g. you botched your global arcconfig, which I cannot help you with), you could also tell Arcanist to only upload the top-most commit:
arc diff HEAD^
If he can commit to the kwin repo,
arc patch D9557 git log --oneline # to see commit hash git checkout master git cherry-pick <commit hash> # check whether KWin compiles and works git push origin master
if he can't
arc patch D9557 git log --oneline # to see commit hash git checkout master # or a branch on which this patch depends git checkout -b dont-hardcode-fb0 git cherry-pick <commit hash> # check whether KWin compiles and works arc diff --update D9557 HEAD^ # and maybe repeat for patches which depend on this patch
The problem is that arc diff assumes an incorrect merge-base for @nerdopolist. Your cherry-picking won't solve this either, because you also have to use HEAD^ in the end, just like I proposed. This is all explained in https://secure.phabricator.com/book/phabricator/article/arcanist_commit_ranges/.
Anyway, I guess this will work now, either with HEAD^, or with setting the merge-base via --set-upstream-to.
On fresh clone of the repo and after arc patch D9557, calling gitk shows your commit is attached to 50b948134c8, which is from December, and the dependent Diff is missing too. However, that's not how it should look like. Your commit should have the local commit of D9556 as its parent, and the parent of D9556 should be d3f8b979a0c2 (at the time of writing).
Let me repeat the exact steps, based on the current situation you created on Phab:
git clone https://anongit.kde.org/kwin cd kwin arc patch D9556 arc patch D9557 git rebase arcpatch-D9556 git branch --set-upstream-to=arcpatch-D9556 gitk --all arc which arc diff