Mir

Merge lp://qastaging/~alan-griffiths/mir/fix-1526779 into lp://qastaging/mir

  1. fix-1526779
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Merged
Approved by: Chris Halse Rogers
Approved revision: no longer in the source branch.
Merged at revision: 3214
Proposed branch: lp://qastaging/~alan-griffiths/mir/fix-1526779
Merge into: lp://qastaging/mir
Diff against target: 105 lines (+51/-8)
2 files modified
src/platforms/mesa/server/kms/cursor.cpp (+15/-8)
tests/unit-tests/graphics/mesa/kms/test_cursor.cpp (+36/-0)
To merge this branch: bzr merge lp://qastaging/~alan-griffiths/mir/fix-1526779
Reviewer Review Type Date Requested Status
Chris Halse Rogers Approve
PS Jenkins bot (community) continuous-integration Approve
Alberto Aguirre (community) Approve
Andreas Pokorny (community) Approve
Review via email: mp+280880@code.qastaging.launchpad.net

Commit message

platforms/mesa-kms: add a frig option (MIR_DRM_CURSOR_64x64) to workaround drm getting the cursor size wrong

Description of the change

platforms/mesa-kms: add a frig option (MIR_DRM_CURSOR_64x64) to workaround drm getting the cursor size wrong

This is a problem on an old (VGN-FJ1Z) laptop. On the presumption that this won't be the only time this is encountered added a environment variable workaround the problem.

To post a comment you must log in.
Revision history for this message
Alberto Aguirre (albaguirre) wrote :

LGTM, but no test?

review: Needs Fixing
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> LGTM, but no test?

true. MesaCursorTest.can_force_64x64_cursor added to xmas list.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3204
http://jenkins.qa.ubuntu.com/job/mir-ci/5879/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5354
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5307
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/189/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/205
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/205/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/205
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/205/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5304
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5304/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7814
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/185
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/185/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/41/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26178

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5879/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Workarounds on workarounds :S

Check with anpok who I think fixed this last. There were some non-obvious things broken in drivers/Mesa IIRC.

Revision history for this message
Andreas Pokorny (andreas-pokorny) wrote :

fine with me ..

the issue back then was that gbm ignored what kind of buffer drm allocates.. there is no validation or figuring out which stride will be valid for the buffer... to verschlimmbesser the situation that ioctl was added to better guess what buffer size drm will return on the gbm creation attempt. Still there is no indication if that is the only valid size. In the end it might return the max size of the topmost plane... But this is hopefully something we can stop using when we finally move to kms planes for cursors..

review: Approve
Revision history for this message
Andreas Pokorny (andreas-pokorny) wrote :

maybe we should add a doc for that? or a platform program option?

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3206
http://jenkins.qa.ubuntu.com/job/mir-ci/5889/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5369
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4276
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5322
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/204
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/215
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/215/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/215
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/215/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5319
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5319/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7828
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/200
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/200/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/55
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26220

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5889/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alberto Aguirre (albaguirre) wrote :

LGTM.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2294/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5385
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4292
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5338/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/127
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/127/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/127
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/127/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5335
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5335/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7843/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26270

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3207
http://jenkins.qa.ubuntu.com/job/mir-ci/5903/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5392
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4299
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5345
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/220
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/229
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/229/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/229
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/229/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5342
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5342/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7849
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26280
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/216
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/216/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/72
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26283

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5903/rebuild

review: Approve (continuous-integration)
Revision history for this message
Chris Halse Rogers (raof) wrote :

I suspect moving to kms planes for cursors will, rather than resolving all these issues, just end up with us requiring a more general framework for such workarounds ☺. (While still being the right thing to do, etc).

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches