tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915/atomic: convert intel_atomic.c to struct intel_display
Going forward, struct intel_display is the main display device data
pointer. Convert intel_atomic.c to struct intel_display.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/7ef6fe795e4e5c26ae0d546e57f64f494aaf56fc.1742554320.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+11
-12
+11
-12
drivers/gpu/drm/i915/display/intel_atomic.c
+11
-12
drivers/gpu/drm/i915/display/intel_atomic.c
···
33
33
#include <drm/drm_atomic.h>
34
34
#include <drm/drm_atomic_helper.h>
35
35
#include <drm/drm_fourcc.h>
36
+
#include <drm/drm_print.h>
36
37
37
-
#include "i915_drv.h"
38
38
#include "intel_atomic.h"
39
39
#include "intel_cdclk.h"
40
+
#include "intel_display_core.h"
40
41
#include "intel_display_types.h"
41
42
#include "intel_dp_tunnel.h"
43
+
#include "intel_fb.h"
42
44
#include "intel_global_state.h"
43
45
#include "intel_hdcp.h"
44
46
#include "intel_psr.h"
45
-
#include "intel_fb.h"
46
47
#include "skl_universal_plane.h"
47
48
48
49
/**
···
60
59
struct drm_property *property,
61
60
u64 *val)
62
61
{
63
-
struct drm_device *dev = connector->dev;
64
-
struct drm_i915_private *dev_priv = to_i915(dev);
62
+
struct intel_display *display = to_intel_display(connector->dev);
65
63
const struct intel_digital_connector_state *intel_conn_state =
66
64
to_intel_digital_connector_state(state);
67
65
68
-
if (property == dev_priv->display.properties.force_audio)
66
+
if (property == display->properties.force_audio)
69
67
*val = intel_conn_state->force_audio;
70
-
else if (property == dev_priv->display.properties.broadcast_rgb)
68
+
else if (property == display->properties.broadcast_rgb)
71
69
*val = intel_conn_state->broadcast_rgb;
72
70
else {
73
-
drm_dbg_atomic(&dev_priv->drm,
71
+
drm_dbg_atomic(display->drm,
74
72
"Unknown property [PROP:%d:%s]\n",
75
73
property->base.id, property->name);
76
74
return -EINVAL;
···
92
92
struct drm_property *property,
93
93
u64 val)
94
94
{
95
-
struct drm_device *dev = connector->dev;
96
-
struct drm_i915_private *dev_priv = to_i915(dev);
95
+
struct intel_display *display = to_intel_display(connector->dev);
97
96
struct intel_digital_connector_state *intel_conn_state =
98
97
to_intel_digital_connector_state(state);
99
98
100
-
if (property == dev_priv->display.properties.force_audio) {
99
+
if (property == display->properties.force_audio) {
101
100
intel_conn_state->force_audio = val;
102
101
return 0;
103
102
}
104
103
105
-
if (property == dev_priv->display.properties.broadcast_rgb) {
104
+
if (property == display->properties.broadcast_rgb) {
106
105
intel_conn_state->broadcast_rgb = val;
107
106
return 0;
108
107
}
109
108
110
-
drm_dbg_atomic(&dev_priv->drm, "Unknown property [PROP:%d:%s]\n",
109
+
drm_dbg_atomic(display->drm, "Unknown property [PROP:%d:%s]\n",
111
110
property->base.id, property->name);
112
111
return -EINVAL;
113
112
}