Commit d0d392a8 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/tc: un-inline intel_tc_port_ref_held() 



Avoid including the intel_drv.h mega header from other header files to
make further header cleanup easier.

v2: restore the over-eagerly dropped <linux/types.h> (Imre)

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190806113700.18816-1-jani.nikula@intel.com
parent e15fd1be

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

+7 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include "intel_display.h"

#include "intel_dp_mst.h"

#include "intel_tc.h"

#include "intel_drv.h"



static const char *tc_port_mode_name(enum tc_port_mode mode)

{
@@ -503,6 +504,12 @@ void intel_tc_port_unlock(struct intel_digital_port *dig_port) 
				      wakeref);

}



bool intel_tc_port_ref_held(struct intel_digital_port *dig_port)

{

	return mutex_is_locked(&dig_port->tc_lock) ||

	       dig_port->tc_link_refcount;

}



void intel_tc_port_get_link(struct intel_digital_port *dig_port,

			    int required_lanes)

{

drivers/gpu/drm/i915/display/intel_tc.h

+2 −7
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <linux/mutex.h>

#include <linux/types.h>



#include "intel_drv.h"

struct intel_digital_port;



bool intel_tc_port_connected(struct intel_digital_port *dig_port);

u32 intel_tc_port_get_lane_mask(struct intel_digital_port *dig_port);
@@ -23,12 +23,7 @@ void intel_tc_port_unlock(struct intel_digital_port *dig_port); 
void intel_tc_port_get_link(struct intel_digital_port *dig_port,

			    int required_lanes);

void intel_tc_port_put_link(struct intel_digital_port *dig_port);



static inline int intel_tc_port_ref_held(struct intel_digital_port *dig_port)

{

	return mutex_is_locked(&dig_port->tc_lock) ||

	       dig_port->tc_link_refcount;

}

bool intel_tc_port_ref_held(struct intel_digital_port *dig_port);



void intel_tc_port_init(struct intel_digital_port *dig_port, bool is_legacy);

CRA Git | Maintained and supported by SUSTech CRA and CCSE