Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: ui/ozone/platform/dri/display_snapshot_dri.cc

Issue 763343004: ozone: dri: Mark DSI connectors as internal (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/ozone/platform/dri/display_snapshot_dri.h" 5 #include "ui/ozone/platform/dri/display_snapshot_dri.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <xf86drmMode.h> 9 #include <xf86drmMode.h>
10 10
11 #include "base/format_macros.h" 11 #include "base/format_macros.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/strings/stringprintf.h" 13 #include "base/strings/stringprintf.h"
14 #include "ui/display/util/edid_parser.h" 14 #include "ui/display/util/edid_parser.h"
15 #include "ui/ozone/platform/dri/display_mode_dri.h" 15 #include "ui/ozone/platform/dri/display_mode_dri.h"
16 #include "ui/ozone/platform/dri/dri_util.h" 16 #include "ui/ozone/platform/dri/dri_util.h"
17 #include "ui/ozone/platform/dri/dri_wrapper.h" 17 #include "ui/ozone/platform/dri/dri_wrapper.h"
18 18
19 #if !defined(DRM_MODE_CONNECTOR_DSI)
20 #define DRM_MODE_CONNECTOR_DSI 16
21 #endif
22
19 namespace ui { 23 namespace ui {
20 24
21 namespace { 25 namespace {
22 26
23 DisplayConnectionType GetDisplayType(drmModeConnector* connector) { 27 DisplayConnectionType GetDisplayType(drmModeConnector* connector) {
24 switch (connector->connector_type) { 28 switch (connector->connector_type) {
25 case DRM_MODE_CONNECTOR_VGA: 29 case DRM_MODE_CONNECTOR_VGA:
26 return DISPLAY_CONNECTION_TYPE_VGA; 30 return DISPLAY_CONNECTION_TYPE_VGA;
27 case DRM_MODE_CONNECTOR_DVII: 31 case DRM_MODE_CONNECTOR_DVII:
28 case DRM_MODE_CONNECTOR_DVID: 32 case DRM_MODE_CONNECTOR_DVID:
29 case DRM_MODE_CONNECTOR_DVIA: 33 case DRM_MODE_CONNECTOR_DVIA:
30 return DISPLAY_CONNECTION_TYPE_DVI; 34 return DISPLAY_CONNECTION_TYPE_DVI;
31 case DRM_MODE_CONNECTOR_LVDS: 35 case DRM_MODE_CONNECTOR_LVDS:
32 case DRM_MODE_CONNECTOR_eDP: 36 case DRM_MODE_CONNECTOR_eDP:
37 case DRM_MODE_CONNECTOR_DSI:
33 return DISPLAY_CONNECTION_TYPE_INTERNAL; 38 return DISPLAY_CONNECTION_TYPE_INTERNAL;
34 case DRM_MODE_CONNECTOR_DisplayPort: 39 case DRM_MODE_CONNECTOR_DisplayPort:
35 return DISPLAY_CONNECTION_TYPE_DISPLAYPORT; 40 return DISPLAY_CONNECTION_TYPE_DISPLAYPORT;
36 case DRM_MODE_CONNECTOR_HDMIA: 41 case DRM_MODE_CONNECTOR_HDMIA:
37 case DRM_MODE_CONNECTOR_HDMIB: 42 case DRM_MODE_CONNECTOR_HDMIB:
38 return DISPLAY_CONNECTION_TYPE_HDMI; 43 return DISPLAY_CONNECTION_TYPE_HDMI;
39 default: 44 default:
40 return DISPLAY_CONNECTION_TYPE_UNKNOWN; 45 return DISPLAY_CONNECTION_TYPE_UNKNOWN;
41 } 46 }
42 } 47 }
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 127
123 std::string DisplaySnapshotDri::ToString() const { 128 std::string DisplaySnapshotDri::ToString() const {
124 return base::StringPrintf( 129 return base::StringPrintf(
125 "[type=%d, connector=%" PRIu32 ", crtc=%" PRIu32 ", mode=%s, dim=%s]", 130 "[type=%d, connector=%" PRIu32 ", crtc=%" PRIu32 ", mode=%s, dim=%s]",
126 type_, connector_, crtc_, 131 type_, connector_, crtc_,
127 current_mode_ ? current_mode_->ToString().c_str() : "NULL", 132 current_mode_ ? current_mode_->ToString().c_str() : "NULL",
128 physical_size_.ToString().c_str()); 133 physical_size_.ToString().c_str());
129 } 134 }
130 135
131 } // namespace ui 136 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698