Mir

Merge lp://qastaging/~kdub/mir/android-physical-size into lp://qastaging/mir

  1. android-physical-size
  2. Merge into development-branch
Proposed by Kevin DuBois
Status: Merged
Approved by: Kevin DuBois
Approved revision: no longer in the source branch.
Merged at revision: 2386
Proposed branch: lp://qastaging/~kdub/mir/android-physical-size
Merge into: lp://qastaging/mir
Diff against target: 131 lines (+43/-14)
2 files modified
src/platforms/android/server/hwc_blanking_control.cpp (+14/-1)
tests/unit-tests/graphics/android/test_hwc_configuration.cpp (+29/-13)
To merge this branch: bzr merge lp://qastaging/~kdub/mir/android-physical-size
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Chris Halse Rogers Approve
Daniel van Vugt Approve
Alan Griffiths Approve
Robert Carr (community) Approve
Review via email: mp+252338@code.qastaging.launchpad.net

Commit message

android: pass the reported physical size of the display from the driver to the rest of the mir system.

fixes: lp: #1430315

Description of the change

android: pass the reported physical size of the display from the driver to the rest of the mir system.

To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Mostly OK. But...

72 -TEST_F(HwcConfiguration, no_fpe_from_malformed_refresh)
73 +TEST_F(HwcConfiguration, no_fpe_from_malformed_refresh_or_dpi)

"no_fpe_from_malformed_refresh_or_dpi" is a bit hard to parse (especially as what the test does).

"no_fpe_or_dpi_from_malformed_refresh" is probably better, but breaks the "one test per condition" rule.

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

FAILED: Continuous integration, rev:2382
http://jenkins.qa.ubuntu.com/job/mir-ci/3166/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1566
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1565/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1520
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1163
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1163/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1520
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1520/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4537
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18675

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Robert Carr (robertcarr) wrote :

LGTM

review: Approve
Revision history for this message
Kevin DuBois (kdub) wrote :

failure looks unrelated, filed: https://bugs.launchpad.net/mir/+bug/1430000

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

PASSED: Continuous integration, rev:2383
http://jenkins.qa.ubuntu.com/job/mir-ci/3167/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1567
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1566
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1521
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1164
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1164/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1521
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1521/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4538
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18676

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

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

PASSED: Continuous integration, rev:2383
http://jenkins.qa.ubuntu.com/job/mir-ci/3171/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1571
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1570
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1525
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1168
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1168/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1525
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1525/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4542
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18681

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

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

Cool. If you can however, try using or extending "mir/geometry/length.h" instead of:

10 +int dpi_to_mm(uint32_t dpi, int pixel_num)

Suggest fixing, not needs fixing.

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

OK

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

FAILED: Continuous integration, rev:2384
http://jenkins.qa.ubuntu.com/job/mir-ci/3185/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1590
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1589/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1544/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1182
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1182/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1544
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1544/artifact/work/output/*zip*/output.zip
    ABORTED: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4560/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18728

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

The above http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4560/console build was aborted due to an unbootable image making it into the pipeline. The build has been restarted.

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

PASSED: Continuous integration, rev:2384
http://jenkins.qa.ubuntu.com/job/mir-ci/3186/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1591
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1590
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1545
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1183
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1183/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1545
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1545/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4561
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18736

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

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) :
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/1211/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1594/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1593
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1548
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-autolanding/391
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-autolanding/391/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1548
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1548/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4564
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18741

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

Looks sensible, to the extent that Android allows you to be. Do you really have to calculate display size from DPI?

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Judging by the HWC API, yes it probably does need to be done this way.

Although in hindsight, this particular case allows for very little utilization of mir::geometry::Length.

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/1213/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1597
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1596/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1551
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-autolanding/393
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-autolanding/393/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1551
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1551/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4567
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18747

review: Needs Fixing (continuous-integration)
Revision history for this message
Kevin DuBois (kdub) wrote :

^^ ci bug: https://bugs.launchpad.net/mir/+bug/1430000

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

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