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
=== modified file 'include/client/mir_toolkit/client_types.h'
--- include/client/mir_toolkit/client_types.h 2016-10-12 13:31:04 +0000
+++ include/client/mir_toolkit/client_types.h 2016-11-03 09:43:12 +0000
@@ -283,7 +283,9 @@
283 mir_display_output_type_hdmib = mir_output_type_hdmib,283 mir_display_output_type_hdmib = mir_output_type_hdmib,
284 mir_display_output_type_tv = mir_output_type_tv,284 mir_display_output_type_tv = mir_output_type_tv,
285 mir_display_output_type_edp = mir_output_type_edp,285 mir_display_output_type_edp = mir_output_type_edp,
286 mir_display_output_type_virtual = mir_output_type_virtual286 mir_display_output_type_virtual = mir_output_type_virtual,
287 mir_display_output_type_dsi = mir_output_type_dsi,
288 mir_display_output_type_dpi = mir_output_type_dpi,
287} MirDisplayOutputType;289} MirDisplayOutputType;
288290
289typedef enum MirOutputConnectionState291typedef enum MirOutputConnectionState
290292
=== modified file 'include/core/mir_toolkit/common.h'
--- include/core/mir_toolkit/common.h 2016-10-28 19:31:56 +0000
+++ include/core/mir_toolkit/common.h 2016-11-03 09:43:12 +0000
@@ -123,8 +123,9 @@
123 mir_output_type_hdmib = 12, /* DRM_MODE_CONNECTOR_HDMIB */123 mir_output_type_hdmib = 12, /* DRM_MODE_CONNECTOR_HDMIB */
124 mir_output_type_tv = 13, /* DRM_MODE_CONNECTOR_TV */124 mir_output_type_tv = 13, /* DRM_MODE_CONNECTOR_TV */
125 mir_output_type_edp = 14, /* DRM_MODE_CONNECTOR_eDP */125 mir_output_type_edp = 14, /* DRM_MODE_CONNECTOR_eDP */
126 mir_output_type_virtual = 15 /* DRM_MODE_CONNECTOR_VIRTUAL */126 mir_output_type_virtual = 15, /* DRM_MODE_CONNECTOR_VIRTUAL */
127/* TODO = 16 DRM_MODE_CONNECTOR_DSI */127 mir_output_type_dsi = 16, /* DRM_MODE_CONNECTOR_DSI */
128 mir_output_type_dpi = 17, /* DRM_MODE_CONNECTOR_DPI */
128} MirOutputType;129} MirOutputType;
129130
130typedef enum MirPromptSessionState131typedef enum MirPromptSessionState
131132
=== modified file 'include/platform/mir/graphics/display_configuration.h'
--- include/platform/mir/graphics/display_configuration.h 2016-10-28 19:31:56 +0000
+++ include/platform/mir/graphics/display_configuration.h 2016-11-03 09:43:12 +0000
@@ -68,7 +68,9 @@
68 hdmib = mir_output_type_hdmib,68 hdmib = mir_output_type_hdmib,
69 tv = mir_output_type_tv,69 tv = mir_output_type_tv,
70 edp = mir_output_type_edp,70 edp = mir_output_type_edp,
71 virt = mir_output_type_virtual71 virt = mir_output_type_virtual,
72 dsi = mir_output_type_dsi,
73 dpi = mir_output_type_dpi,
72};74};
7375
74/**76/**
7577
=== modified file 'src/common/output_type_names.cpp'
--- src/common/output_type_names.cpp 2016-09-12 03:18:57 +0000
+++ src/common/output_type_names.cpp 2016-11-03 09:43:12 +0000
@@ -40,7 +40,9 @@
40 "HDMI-B",40 "HDMI-B",
41 "TV",41 "TV",
42 "eDP",42 "eDP",
43 "Virtual"43 "Virtual",
44 "DSI",
45 "DPI",
44 };46 };
45 if (output_type < sizeof(name)/sizeof(name[0]))47 if (output_type < sizeof(name)/sizeof(name[0]))
46 return name[output_type];48 return name[output_type];
4749
=== modified file 'tests/integration-tests/test_server_client_types.cpp'
--- tests/integration-tests/test_server_client_types.cpp 2016-07-18 07:38:38 +0000
+++ tests/integration-tests/test_server_client_types.cpp 2016-11-03 09:43:12 +0000
@@ -45,4 +45,6 @@
45 EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(edp);45 EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(edp);
46 EXPECT_EQ(static_cast<mg::DisplayConfigurationOutputType>(mir_display_output_type_virtual),46 EXPECT_EQ(static_cast<mg::DisplayConfigurationOutputType>(mir_display_output_type_virtual),
47 mg::DisplayConfigurationOutputType::virt);47 mg::DisplayConfigurationOutputType::virt);
48 EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(dsi);
49 EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(dpi);
48}50}

Subscribers

People subscribed via source and target branches