Mir

Merge lp:~vanvugt/mir/raspberry-pi-output-types into lp:mir

  1. raspberry-pi-output-types
  2. Merge into development-branch
Proposed by Daniel van Vugt
Status: Merged
Approved by: Kevin DuBois
Approved revision: no longer in the source branch.
Merged at revision: 3802
Proposed branch: lp:~vanvugt/mir/raspberry-pi-output-types
Merge into: lp:mir
Diff against target: 71 lines (+14/-5)
5 files modified
include/client/mir_toolkit/client_types.h (+3/-1)
include/core/mir_toolkit/common.h (+3/-2)
include/platform/mir/graphics/display_configuration.h (+3/-1)
src/common/output_type_names.cpp (+3/-1)
tests/integration-tests/test_server_client_types.cpp (+2/-0)
To merge this branch: bzr merge lp:~vanvugt/mir/raspberry-pi-output-types
Reviewer Review Type Date Requested Status
Kevin DuBois (community) Approve
Alberto Aguirre (community) Approve
Mir CI Bot continuous-integration Approve
Review via email: mp+309924@code.launchpad.net

Commit message

Add support (just correct identification) for Raspberry Pi outputs.

Description of the change

Not because I'm a Pi fan, but because it's nice to stay up to date
with everything DRM supports.

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:3800
https://mir-jenkins.ubuntu.com/job/mir-ci/2104/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2705
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2768
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2760
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2760
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2760
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2734
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2734/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2734
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2734/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2734
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2734/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2734
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2734/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2734
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2734/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2734
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2734/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2104/rebuild

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

LGTM

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

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/client/mir_toolkit/client_types.h'
2--- include/client/mir_toolkit/client_types.h 2016-10-12 13:31:04 +0000
3+++ include/client/mir_toolkit/client_types.h 2016-11-03 09:43:12 +0000
4@@ -283,7 +283,9 @@
5 mir_display_output_type_hdmib = mir_output_type_hdmib,
6 mir_display_output_type_tv = mir_output_type_tv,
7 mir_display_output_type_edp = mir_output_type_edp,
8- mir_display_output_type_virtual = mir_output_type_virtual
9+ mir_display_output_type_virtual = mir_output_type_virtual,
10+ mir_display_output_type_dsi = mir_output_type_dsi,
11+ mir_display_output_type_dpi = mir_output_type_dpi,
12 } MirDisplayOutputType;
13
14 typedef enum MirOutputConnectionState
15
16=== modified file 'include/core/mir_toolkit/common.h'
17--- include/core/mir_toolkit/common.h 2016-10-28 19:31:56 +0000
18+++ include/core/mir_toolkit/common.h 2016-11-03 09:43:12 +0000
19@@ -123,8 +123,9 @@
20 mir_output_type_hdmib = 12, /* DRM_MODE_CONNECTOR_HDMIB */
21 mir_output_type_tv = 13, /* DRM_MODE_CONNECTOR_TV */
22 mir_output_type_edp = 14, /* DRM_MODE_CONNECTOR_eDP */
23- mir_output_type_virtual = 15 /* DRM_MODE_CONNECTOR_VIRTUAL */
24-/* TODO = 16 DRM_MODE_CONNECTOR_DSI */
25+ mir_output_type_virtual = 15, /* DRM_MODE_CONNECTOR_VIRTUAL */
26+ mir_output_type_dsi = 16, /* DRM_MODE_CONNECTOR_DSI */
27+ mir_output_type_dpi = 17, /* DRM_MODE_CONNECTOR_DPI */
28 } MirOutputType;
29
30 typedef enum MirPromptSessionState
31
32=== modified file 'include/platform/mir/graphics/display_configuration.h'
33--- include/platform/mir/graphics/display_configuration.h 2016-10-28 19:31:56 +0000
34+++ include/platform/mir/graphics/display_configuration.h 2016-11-03 09:43:12 +0000
35@@ -68,7 +68,9 @@
36 hdmib = mir_output_type_hdmib,
37 tv = mir_output_type_tv,
38 edp = mir_output_type_edp,
39- virt = mir_output_type_virtual
40+ virt = mir_output_type_virtual,
41+ dsi = mir_output_type_dsi,
42+ dpi = mir_output_type_dpi,
43 };
44
45 /**
46
47=== modified file 'src/common/output_type_names.cpp'
48--- src/common/output_type_names.cpp 2016-09-12 03:18:57 +0000
49+++ src/common/output_type_names.cpp 2016-11-03 09:43:12 +0000
50@@ -40,7 +40,9 @@
51 "HDMI-B",
52 "TV",
53 "eDP",
54- "Virtual"
55+ "Virtual",
56+ "DSI",
57+ "DPI",
58 };
59 if (output_type < sizeof(name)/sizeof(name[0]))
60 return name[output_type];
61
62=== modified file 'tests/integration-tests/test_server_client_types.cpp'
63--- tests/integration-tests/test_server_client_types.cpp 2016-07-18 07:38:38 +0000
64+++ tests/integration-tests/test_server_client_types.cpp 2016-11-03 09:43:12 +0000
65@@ -45,4 +45,6 @@
66 EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(edp);
67 EXPECT_EQ(static_cast<mg::DisplayConfigurationOutputType>(mir_display_output_type_virtual),
68 mg::DisplayConfigurationOutputType::virt);
69+ EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(dsi);
70+ EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(dpi);
71 }

Subscribers

People subscribed via source and target branches