1
=== modified file 'src/platforms/mesa/server/kms/display.cpp'
2
--- src/platforms/mesa/server/kms/display.cpp	2017-03-31 06:56:29 +0000
3
+++ src/platforms/mesa/server/kms/display.cpp	2017-04-06 09:50:50 +0000
4
@@ -95,34 +95,6 @@
5
95
    return fds;
95
    return fds;
6
96
}
96
}
7
97
97
8
98
double calculate_vrefresh_hz(drmModeModeInfo const& mode)
9
99
{
10
100
    if (mode.htotal == 0 || mode.vtotal == 0)
11
101
        return 0.0;
12
102
13
103
    /* mode.clock is in KHz */
14
104
    double hz = (mode.clock * 100000LL /
15
105
                 ((long)mode.htotal * (long)mode.vtotal)
16
106
                ) / 100.0;
17
107
18
108
    return hz;
19
109
}
20
110
21
111
char const* describe_connection_status(drmModeConnector const& connection)
22
112
{
23
113
    switch (connection.connection)
24
114
    {
25
115
    case DRM_MODE_CONNECTED:
26
116
        return "connected";
27
117
    case DRM_MODE_DISCONNECTED:
28
118
        return "disconnected";
29
119
    case DRM_MODE_UNKNOWNCONNECTION:
30
120
        return "UNKNOWN";
31
121
    default:
32
122
        return "<Unexpected connection value>";
33
123
    }
34
124
}
35
125
36
126
void log_drm_details(std::vector<std::shared_ptr<mgm::helpers::DRMHelper>> const& drm)
98
void log_drm_details(std::vector<std::shared_ptr<mgm::helpers::DRMHelper>> const& drm)
37
127
{
99
{
38
128
    mir::log_info("DRM device details:");
100
    mir::log_info("DRM device details:");
39
@@ -146,23 +118,6 @@
40
146
            version->version_minor,
118
            version->version_minor,
41
147
            version->version_patchlevel,
119
            version->version_patchlevel,
42
148
            version->date);
120
            version->date);
43
149
44
150
        mg::kms::DRMModeResources resources{device->fd};
45
151
        for (auto const& connector : resources.connectors())
46
152
        {
47
153
            mir::log_info(
48
154
                "\tOutput: %s (%s)",
49
155
                mg::kms::connector_name(connector).c_str(),
50
156
                describe_connection_status(*connector));
51
157
            for (auto i = 0; i < connector->count_modes; ++i)
52
158
            {
53
159
                mir::log_info(
54
160
                    "\t\tMode: %i×%i@%.2f",
55
161
                    connector->modes[i].hdisplay,
56
162
                    connector->modes[i].vdisplay,
57
163
                    calculate_vrefresh_hz(connector->modes[i]));
58
164
            }
59
165
        }
60
166
    }
121
    }
61
167
}
122
}
62
168
123
Status:	Work in progress
Proposed branch:	lp:~vanvugt/mir/remove-hybrid-outputs-logging
Merge into:	lp:mir
Diff against target:	61 lines (+0/-45) 1 file modified src/platforms/mesa/server/kms/display.cpp (+0/-45)
To merge this branch:	bzr merge lp:~vanvugt/mir/remove-hybrid-outputs-logging
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2017-04-06
Cemil Azizoglu (community)			Abstain on 2017-04-05
Chris Halse Rogers		2017-04-05	Abstain on 2017-04-05
Review via email: mp+321943@code.launchpad.net