tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915/display: convert intel_modeset_verify.c to struct intel_display
Going forward, struct intel_display is the main display device data
pointer. Convert intel_modeset_verify.[ch] to struct intel_display.
Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Link: https://lore.kernel.org/r/b01a3ef3dbb2ffdaa6b5e9ebec14f91efcca3049.1744222449.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+7
-10
+7
-10
drivers/gpu/drm/i915/display/intel_modeset_verify.c
+7
-10
drivers/gpu/drm/i915/display/intel_modeset_verify.c
···
6
6
*/
7
7
8
8
#include <drm/drm_atomic_state_helper.h>
9
+
#include <drm/drm_print.h>
9
10
10
-
#include "i915_drv.h"
11
11
#include "intel_atomic.h"
12
12
#include "intel_crtc.h"
13
13
#include "intel_crtc_state_dump.h"
14
14
#include "intel_cx0_phy.h"
15
15
#include "intel_display.h"
16
+
#include "intel_display_core.h"
16
17
#include "intel_display_types.h"
17
18
#include "intel_fdi.h"
18
19
#include "intel_modeset_verify.h"
···
29
28
{
30
29
struct intel_connector *connector = to_intel_connector(conn_state->connector);
31
30
struct intel_display *display = to_intel_display(connector);
32
-
struct drm_i915_private *i915 = to_i915(connector->base.dev);
33
31
34
-
drm_dbg_kms(&i915->drm, "[CONNECTOR:%d:%s]\n",
32
+
drm_dbg_kms(display->drm, "[CONNECTOR:%d:%s]\n",
35
33
connector->base.base.id, connector->base.name);
36
34
37
35
if (connector->get_hw_state(connector)) {
···
91
91
static void intel_pipe_config_sanity_check(const struct intel_crtc_state *crtc_state)
92
92
{
93
93
struct intel_display *display = to_intel_display(crtc_state);
94
-
struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev);
95
94
96
95
if (crtc_state->has_pch_encoder) {
97
96
int fdi_dotclock = intel_dotclock_calculate(intel_fdi_link_freq(display, crtc_state),
···
102
103
* Yell if the encoder disagrees. Allow for slight
103
104
* rounding differences.
104
105
*/
105
-
drm_WARN(&i915->drm, abs(fdi_dotclock - dotclock) > 1,
106
+
drm_WARN(display->drm, abs(fdi_dotclock - dotclock) > 1,
106
107
"FDI dotclock and encoder dotclock mismatch, fdi: %i, encoder: %i\n",
107
108
fdi_dotclock, dotclock);
108
109
}
···
112
113
verify_encoder_state(struct intel_atomic_state *state)
113
114
{
114
115
struct intel_display *display = to_intel_display(state);
115
-
struct drm_i915_private *i915 = to_i915(state->base.dev);
116
116
struct intel_encoder *encoder;
117
117
struct drm_connector *connector;
118
118
const struct drm_connector_state *old_conn_state, *new_conn_state;
119
119
int i;
120
120
121
-
for_each_intel_encoder(&i915->drm, encoder) {
121
+
for_each_intel_encoder(display->drm, encoder) {
122
122
bool enabled = false, found = false;
123
123
enum pipe pipe;
124
124
125
-
drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s]\n",
125
+
drm_dbg_kms(display->drm, "[ENCODER:%d:%s]\n",
126
126
encoder->base.base.id,
127
127
encoder->base.name);
128
128
···
164
166
struct intel_crtc *crtc)
165
167
{
166
168
struct intel_display *display = to_intel_display(state);
167
-
struct drm_i915_private *i915 = to_i915(display->drm);
168
169
const struct intel_crtc_state *sw_crtc_state =
169
170
intel_atomic_get_new_crtc_state(state, crtc);
170
171
struct intel_crtc_state *hw_crtc_state;
···
182
185
intel_crtc_get_pipe_config(hw_crtc_state);
183
186
184
187
/* we keep both pipes enabled on 830 */
185
-
if (IS_I830(i915) && hw_crtc_state->hw.active)
188
+
if (display->platform.i830 && hw_crtc_state->hw.active)
186
189
hw_crtc_state->hw.active = sw_crtc_state->hw.active;
187
190
188
191
INTEL_DISPLAY_STATE_WARN(display,