Skip to content

Commit f7303ab

Browse files
jnikulajnikula
committed
drm/i915/acpi: convert to struct intel_display
Going forward, struct intel_display shall replace struct drm_i915_private as the main display device data pointer type. Convert intel_acpi.[ch] to struct intel_display. Reviewed-by: Imre Deak <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/465436a3442807b49609fc55c9f652a29f96fd02.1723213547.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <[email protected]>
1 parent 7d113cc commit f7303ab

File tree

4 files changed

+28
-25
lines changed

4 files changed

+28
-25
lines changed

‎drivers/gpu/drm/i915/display/intel_acpi.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,9 @@ void intel_unregister_dsm_handler(void)
183183
{
184184
}
185185

186-
void intel_dsm_get_bios_data_funcs_supported(struct drm_i915_private *i915)
186+
void intel_dsm_get_bios_data_funcs_supported(struct intel_display *display)
187187
{
188-
struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
188+
struct pci_dev *pdev = to_pci_dev(display->drm->dev);
189189
acpi_handle dhandle;
190190
union acpi_object *obj;
191191

@@ -263,15 +263,14 @@ static u32 acpi_display_type(struct intel_connector *connector)
263263
return display_type;
264264
}
265265

266-
void intel_acpi_device_id_update(struct drm_i915_private *dev_priv)
266+
void intel_acpi_device_id_update(struct intel_display *display)
267267
{
268-
struct drm_device *drm_dev = &dev_priv->drm;
269268
struct intel_connector *connector;
270269
struct drm_connector_list_iter conn_iter;
271270
u8 display_index[16] = {};
272271

273272
/* Populate the ACPI IDs for all connectors for a given drm_device */
274-
drm_connector_list_iter_begin(drm_dev, &conn_iter);
273+
drm_connector_list_iter_begin(display->drm, &conn_iter);
275274
for_each_intel_connector_iter(connector, &conn_iter) {
276275
u32 device_id, type;
277276

@@ -288,10 +287,10 @@ void intel_acpi_device_id_update(struct drm_i915_private *dev_priv)
288287
}
289288

290289
/* NOTE: The connector order must be final before this is called. */
291-
void intel_acpi_assign_connector_fwnodes(struct drm_i915_private *i915)
290+
void intel_acpi_assign_connector_fwnodes(struct intel_display *display)
292291
{
292+
struct drm_device *drm_dev = display->drm;
293293
struct drm_connector_list_iter conn_iter;
294-
struct drm_device *drm_dev = &i915->drm;
295294
struct fwnode_handle *fwnode = NULL;
296295
struct drm_connector *connector;
297296
struct acpi_device *adev;
@@ -333,7 +332,7 @@ void intel_acpi_assign_connector_fwnodes(struct drm_i915_private *i915)
333332
fwnode_handle_put(fwnode);
334333
}
335334

336-
void intel_acpi_video_register(struct drm_i915_private *i915)
335+
void intel_acpi_video_register(struct intel_display *display)
337336
{
338337
struct drm_connector_list_iter conn_iter;
339338
struct drm_connector *connector;
@@ -347,7 +346,7 @@ void intel_acpi_video_register(struct drm_i915_private *i915)
347346
* a native backlight later and acpi_video_register_backlight() should
348347
* only be called after any native backlights have been registered.
349348
*/
350-
drm_connector_list_iter_begin(&i915->drm, &conn_iter);
349+
drm_connector_list_iter_begin(display->drm, &conn_iter);
351350
drm_for_each_connector_iter(connector, &conn_iter) {
352351
struct intel_panel *panel = &to_intel_connector(connector)->panel;
353352

‎drivers/gpu/drm/i915/display/intel_acpi.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@
66
#ifndef __INTEL_ACPI_H__
77
#define __INTEL_ACPI_H__
88

9-
struct drm_i915_private;
9+
struct intel_display;
1010

1111
#ifdef CONFIG_ACPI
1212
void intel_register_dsm_handler(void);
1313
void intel_unregister_dsm_handler(void);
14-
void intel_dsm_get_bios_data_funcs_supported(struct drm_i915_private *i915);
15-
void intel_acpi_device_id_update(struct drm_i915_private *i915);
16-
void intel_acpi_assign_connector_fwnodes(struct drm_i915_private *i915);
17-
void intel_acpi_video_register(struct drm_i915_private *i915);
14+
void intel_dsm_get_bios_data_funcs_supported(struct intel_display *display);
15+
void intel_acpi_device_id_update(struct intel_display *display);
16+
void intel_acpi_assign_connector_fwnodes(struct intel_display *display);
17+
void intel_acpi_video_register(struct intel_display *display);
1818
#else
1919
static inline void intel_register_dsm_handler(void) { return; }
2020
static inline void intel_unregister_dsm_handler(void) { return; }
2121
static inline
22-
void intel_dsm_get_bios_data_funcs_supported(struct drm_i915_private *i915) { return; }
22+
void intel_dsm_get_bios_data_funcs_supported(struct intel_display *display) { return; }
2323
static inline
24-
void intel_acpi_device_id_update(struct drm_i915_private *i915) { return; }
24+
void intel_acpi_device_id_update(struct intel_display *display) { return; }
2525
static inline
26-
void intel_acpi_assign_connector_fwnodes(struct drm_i915_private *i915) { return; }
26+
void intel_acpi_assign_connector_fwnodes(struct intel_display *display) { return; }
2727
static inline
28-
void intel_acpi_video_register(struct drm_i915_private *i915) { return; }
28+
void intel_acpi_video_register(struct intel_display *display) { return; }
2929
#endif /* CONFIG_ACPI */
3030

3131
#endif /* __INTEL_ACPI_H__ */

‎drivers/gpu/drm/i915/display/intel_display_driver.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,8 @@ bool intel_display_driver_check_access(struct drm_i915_private *i915)
416416
/* part #2: call after irq install, but before gem init */
417417
int intel_display_driver_probe_nogem(struct drm_i915_private *i915)
418418
{
419-
struct drm_device *dev = &i915->drm;
419+
struct intel_display *display = &i915->display;
420+
struct drm_device *dev = display->drm;
420421
enum pipe pipe;
421422
int ret;
422423

@@ -466,7 +467,7 @@ int intel_display_driver_probe_nogem(struct drm_i915_private *i915)
466467

467468
drm_modeset_lock_all(dev);
468469
intel_modeset_setup_hw_state(i915, dev->mode_config.acquire_ctx);
469-
intel_acpi_assign_connector_fwnodes(i915);
470+
intel_acpi_assign_connector_fwnodes(display);
470471
drm_modeset_unlock_all(dev);
471472

472473
intel_initial_plane_config(i915);
@@ -526,6 +527,7 @@ int intel_display_driver_probe(struct drm_i915_private *i915)
526527

527528
void intel_display_driver_register(struct drm_i915_private *i915)
528529
{
530+
struct intel_display *display = &i915->display;
529531
struct drm_printer p = drm_dbg_printer(&i915->drm, DRM_UT_KMS,
530532
"i915 display info:");
531533

@@ -534,7 +536,7 @@ void intel_display_driver_register(struct drm_i915_private *i915)
534536

535537
/* Must be done after probing outputs */
536538
intel_opregion_register(i915);
537-
intel_acpi_video_register(i915);
539+
intel_acpi_video_register(display);
538540

539541
intel_audio_init(i915);
540542

‎drivers/gpu/drm/i915/display/intel_opregion.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,8 @@ static void set_did(struct intel_opregion *opregion, int i, u32 val)
722722

723723
static void intel_didl_outputs(struct drm_i915_private *dev_priv)
724724
{
725-
struct intel_opregion *opregion = dev_priv->display.opregion;
725+
struct intel_display *display = &dev_priv->display;
726+
struct intel_opregion *opregion = display->opregion;
726727
struct intel_connector *connector;
727728
struct drm_connector_list_iter conn_iter;
728729
int i = 0, max_outputs;
@@ -737,7 +738,7 @@ static void intel_didl_outputs(struct drm_i915_private *dev_priv)
737738
max_outputs = ARRAY_SIZE(opregion->acpi->didl) +
738739
ARRAY_SIZE(opregion->acpi->did2);
739740

740-
intel_acpi_device_id_update(dev_priv);
741+
intel_acpi_device_id_update(display);
741742

742743
drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter);
743744
for_each_intel_connector_iter(connector, &conn_iter) {
@@ -1189,7 +1190,8 @@ void intel_opregion_register(struct drm_i915_private *i915)
11891190

11901191
static void intel_opregion_resume_display(struct drm_i915_private *i915)
11911192
{
1192-
struct intel_opregion *opregion = i915->display.opregion;
1193+
struct intel_display *display = &i915->display;
1194+
struct intel_opregion *opregion = display->opregion;
11931195

11941196
if (opregion->acpi) {
11951197
intel_didl_outputs(i915);
@@ -1210,7 +1212,7 @@ static void intel_opregion_resume_display(struct drm_i915_private *i915)
12101212
}
12111213

12121214
/* Some platforms abuse the _DSM to enable MUX */
1213-
intel_dsm_get_bios_data_funcs_supported(i915);
1215+
intel_dsm_get_bios_data_funcs_supported(display);
12141216
}
12151217

12161218
void intel_opregion_resume(struct drm_i915_private *i915)

0 commit comments

Comments
 (0)