tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915/display: drop a number of dependencies on i915_drv.h
With the switch to an unordered workqueue dedicated to display, we've
stopped using struct drm_i915_private in a number of places, and can
drop the dependencies on i915_drv.h.
Cc: Luca Coelho <luciano.coelho@intel.com>
Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/20250626101636.1896365-1-jani.nikula@intel.com
+17
-9
+4
-1
drivers/gpu/drm/i915/display/intel_dmc.c
+4
-1
drivers/gpu/drm/i915/display/intel_dmc.c
···
26
26
#include <linux/firmware.h>
27
27
#include <drm/drm_vblank.h>
28
28
29
-
#include "i915_drv.h"
29
+
#include <drm/drm_file.h>
30
+
#include <drm/drm_print.h>
31
+
30
32
#include "i915_reg.h"
33
+
#include "i915_utils.h"
31
34
#include "intel_crtc.h"
32
35
#include "intel_de.h"
33
36
#include "intel_display_power_well.h"
-1
drivers/gpu/drm/i915/display/intel_dmc_wl.c
-1
drivers/gpu/drm/i915/display/intel_dmc_wl.c
+2
-1
drivers/gpu/drm/i915/display/intel_drrs.c
+2
-1
drivers/gpu/drm/i915/display/intel_drrs.c
+1
-2
drivers/gpu/drm/i915/display/intel_encoder.c
+1
-2
drivers/gpu/drm/i915/display/intel_encoder.c
···
5
5
6
6
#include <linux/workqueue.h>
7
7
8
-
#include "i915_drv.h"
9
8
#include "intel_display_core.h"
10
9
#include "intel_display_types.h"
11
10
#include "intel_encoder.h"
···
31
32
32
33
void intel_encoder_link_check_queue_work(struct intel_encoder *encoder, int delay_ms)
33
34
{
34
-
struct intel_display *display = to_i915(encoder->base.dev)->display;
35
+
struct intel_display *display = to_intel_display(encoder);
35
36
36
37
mod_delayed_work(display->wq.unordered,
37
38
&encoder->link_check_work, msecs_to_jiffies(delay_ms));
+3
-1
drivers/gpu/drm/i915/display/intel_hdcp.c
+3
-1
drivers/gpu/drm/i915/display/intel_hdcp.c
···
14
14
#include <linux/random.h>
15
15
16
16
#include <drm/display/drm_hdcp_helper.h>
17
+
#include <drm/drm_print.h>
17
18
#include <drm/intel/i915_component.h>
18
19
19
-
#include "i915_drv.h"
20
20
#include "i915_reg.h"
21
+
#include "i915_utils.h"
21
22
#include "intel_connector.h"
22
23
#include "intel_de.h"
23
24
#include "intel_display_power.h"
···
33
32
#include "intel_hdcp_regs.h"
34
33
#include "intel_hdcp_shim.h"
35
34
#include "intel_pcode.h"
35
+
#include "intel_step.h"
36
36
37
37
#define USE_HDCP_GSC(__display) (DISPLAY_VER(__display) >= 14)
38
38
+3
-1
drivers/gpu/drm/i915/display/intel_opregion.c
+3
-1
drivers/gpu/drm/i915/display/intel_opregion.c
+3
-1
drivers/gpu/drm/i915/display/intel_pps.c
+3
-1
drivers/gpu/drm/i915/display/intel_pps.c
+1
-1
drivers/gpu/drm/i915/display/intel_psr.c
+1
-1
drivers/gpu/drm/i915/display/intel_psr.c
···
28
28
#include <drm/drm_debugfs.h>
29
29
#include <drm/drm_vblank.h>
30
30
31
-
#include "i915_drv.h"
32
31
#include "i915_reg.h"
33
32
#include "intel_alpm.h"
34
33
#include "intel_atomic.h"
···
47
48
#include "intel_psr.h"
48
49
#include "intel_psr_regs.h"
49
50
#include "intel_snps_phy.h"
51
+
#include "intel_step.h"
50
52
#include "intel_vblank.h"
51
53
#include "intel_vrr.h"
52
54
#include "skl_universal_plane.h"