Commit 95f2dec0 authored by Jani Nikula's avatar Jani Nikula
Browse files

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: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/20250626101636.1896365-1-jani.nikula@intel.com
parent 64806541

drivers/gpu/drm/i915/display/intel_dmc.c

+4 −1
Original line number Diff line number Diff line
@@ -26,8 +26,11 @@ 
#include <linux/firmware.h>

#include <drm/drm_vblank.h>



#include "i915_drv.h"

#include <drm/drm_file.h>

#include <drm/drm_print.h>



#include "i915_reg.h"

#include "i915_utils.h"

#include "intel_crtc.h"

#include "intel_de.h"

#include "intel_display_power_well.h"

drivers/gpu/drm/i915/display/intel_dmc_wl.c

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 


#include <drm/drm_print.h>



#include "i915_drv.h"

#include "intel_de.h"

#include "intel_display_regs.h"

#include "intel_dmc_regs.h"

drivers/gpu/drm/i915/display/intel_drrs.c

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ 


#include <linux/debugfs.h>



#include "i915_drv.h"

#include <drm/drm_print.h>



#include "intel_atomic.h"

#include "intel_de.h"

#include "intel_display_regs.h"

drivers/gpu/drm/i915/display/intel_encoder.c

+1 −2
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 


#include <linux/workqueue.h>



#include "i915_drv.h"

#include "intel_display_core.h"

#include "intel_display_types.h"

#include "intel_encoder.h"
@@ -32,7 +31,7 @@ void intel_encoder_link_check_flush_work(struct intel_encoder *encoder) 


void intel_encoder_link_check_queue_work(struct intel_encoder *encoder, int delay_ms)

{

	struct intel_display *display = to_i915(encoder->base.dev)->display;

	struct intel_display *display = to_intel_display(encoder);



	mod_delayed_work(display->wq.unordered,

			 &encoder->link_check_work, msecs_to_jiffies(delay_ms));

drivers/gpu/drm/i915/display/intel_hdcp.c

+3 −1
Original line number Diff line number Diff line
@@ -14,10 +14,11 @@ 
#include <linux/random.h>



#include <drm/display/drm_hdcp_helper.h>

#include <drm/drm_print.h>

#include <drm/intel/i915_component.h>



#include "i915_drv.h"

#include "i915_reg.h"

#include "i915_utils.h"

#include "intel_connector.h"

#include "intel_de.h"

#include "intel_display_power.h"
@@ -32,6 +33,7 @@ 
#include "intel_hdcp_regs.h"

#include "intel_hdcp_shim.h"

#include "intel_pcode.h"

#include "intel_step.h"



#define USE_HDCP_GSC(__display)		(DISPLAY_VER(__display) >= 14)