.. | .. |
---|
23 | 23 | * Authors: Dave Airlie |
---|
24 | 24 | * Alex Deucher |
---|
25 | 25 | */ |
---|
26 | | -#include <drm/drmP.h> |
---|
| 26 | + |
---|
27 | 27 | #include <drm/drm_crtc_helper.h> |
---|
28 | 28 | #include <drm/amdgpu_drm.h> |
---|
29 | 29 | #include "amdgpu.h" |
---|
30 | 30 | #include "amdgpu_connectors.h" |
---|
| 31 | +#include "amdgpu_display.h" |
---|
31 | 32 | #include "atom.h" |
---|
32 | 33 | #include "atombios_encoders.h" |
---|
33 | 34 | |
---|
34 | 35 | void |
---|
35 | 36 | amdgpu_link_encoder_connector(struct drm_device *dev) |
---|
36 | 37 | { |
---|
37 | | - struct amdgpu_device *adev = dev->dev_private; |
---|
| 38 | + struct amdgpu_device *adev = drm_to_adev(dev); |
---|
38 | 39 | struct drm_connector *connector; |
---|
| 40 | + struct drm_connector_list_iter iter; |
---|
39 | 41 | struct amdgpu_connector *amdgpu_connector; |
---|
40 | 42 | struct drm_encoder *encoder; |
---|
41 | 43 | struct amdgpu_encoder *amdgpu_encoder; |
---|
42 | 44 | |
---|
| 45 | + drm_connector_list_iter_begin(dev, &iter); |
---|
43 | 46 | /* walk the list and link encoders to connectors */ |
---|
44 | | - list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
---|
| 47 | + drm_for_each_connector_iter(connector, &iter) { |
---|
45 | 48 | amdgpu_connector = to_amdgpu_connector(connector); |
---|
46 | 49 | list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { |
---|
47 | 50 | amdgpu_encoder = to_amdgpu_encoder(encoder); |
---|
.. | .. |
---|
54 | 57 | } |
---|
55 | 58 | } |
---|
56 | 59 | } |
---|
| 60 | + drm_connector_list_iter_end(&iter); |
---|
57 | 61 | } |
---|
58 | 62 | |
---|
59 | 63 | void amdgpu_encoder_set_active_device(struct drm_encoder *encoder) |
---|
.. | .. |
---|
61 | 65 | struct drm_device *dev = encoder->dev; |
---|
62 | 66 | struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder); |
---|
63 | 67 | struct drm_connector *connector; |
---|
| 68 | + struct drm_connector_list_iter iter; |
---|
64 | 69 | |
---|
65 | | - list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
---|
| 70 | + drm_connector_list_iter_begin(dev, &iter); |
---|
| 71 | + drm_for_each_connector_iter(connector, &iter) { |
---|
66 | 72 | if (connector->encoder == encoder) { |
---|
67 | 73 | struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector); |
---|
68 | 74 | amdgpu_encoder->active_device = amdgpu_encoder->devices & amdgpu_connector->devices; |
---|
.. | .. |
---|
71 | 77 | amdgpu_connector->devices, encoder->encoder_type); |
---|
72 | 78 | } |
---|
73 | 79 | } |
---|
| 80 | + drm_connector_list_iter_end(&iter); |
---|
74 | 81 | } |
---|
75 | 82 | |
---|
76 | 83 | struct drm_connector * |
---|
.. | .. |
---|
78 | 85 | { |
---|
79 | 86 | struct drm_device *dev = encoder->dev; |
---|
80 | 87 | struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder); |
---|
81 | | - struct drm_connector *connector; |
---|
| 88 | + struct drm_connector *connector, *found = NULL; |
---|
| 89 | + struct drm_connector_list_iter iter; |
---|
82 | 90 | struct amdgpu_connector *amdgpu_connector; |
---|
83 | 91 | |
---|
84 | | - list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
---|
| 92 | + drm_connector_list_iter_begin(dev, &iter); |
---|
| 93 | + drm_for_each_connector_iter(connector, &iter) { |
---|
85 | 94 | amdgpu_connector = to_amdgpu_connector(connector); |
---|
86 | | - if (amdgpu_encoder->active_device & amdgpu_connector->devices) |
---|
87 | | - return connector; |
---|
| 95 | + if (amdgpu_encoder->active_device & amdgpu_connector->devices) { |
---|
| 96 | + found = connector; |
---|
| 97 | + break; |
---|
| 98 | + } |
---|
88 | 99 | } |
---|
89 | | - return NULL; |
---|
| 100 | + drm_connector_list_iter_end(&iter); |
---|
| 101 | + return found; |
---|
90 | 102 | } |
---|
91 | 103 | |
---|
92 | 104 | struct drm_connector * |
---|
.. | .. |
---|
94 | 106 | { |
---|
95 | 107 | struct drm_device *dev = encoder->dev; |
---|
96 | 108 | struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder); |
---|
97 | | - struct drm_connector *connector; |
---|
| 109 | + struct drm_connector *connector, *found = NULL; |
---|
| 110 | + struct drm_connector_list_iter iter; |
---|
98 | 111 | struct amdgpu_connector *amdgpu_connector; |
---|
99 | 112 | |
---|
100 | | - list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
---|
| 113 | + drm_connector_list_iter_begin(dev, &iter); |
---|
| 114 | + drm_for_each_connector_iter(connector, &iter) { |
---|
101 | 115 | amdgpu_connector = to_amdgpu_connector(connector); |
---|
102 | | - if (amdgpu_encoder->devices & amdgpu_connector->devices) |
---|
103 | | - return connector; |
---|
| 116 | + if (amdgpu_encoder->devices & amdgpu_connector->devices) { |
---|
| 117 | + found = connector; |
---|
| 118 | + break; |
---|
| 119 | + } |
---|
104 | 120 | } |
---|
105 | | - return NULL; |
---|
| 121 | + drm_connector_list_iter_end(&iter); |
---|
| 122 | + return found; |
---|
106 | 123 | } |
---|
107 | 124 | |
---|
108 | 125 | struct drm_encoder *amdgpu_get_external_encoder(struct drm_encoder *encoder) |
---|