Commit 1c21348d authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move intel connector specific functions to intel_connector.c 



Now that we have intel_connector.c, move the connector specific
functions from intel_display.c there. Fix a few checkpatch complaints
while at it. No functional changes.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181010075205.7713-2-jani.nikula@intel.com
parent 360fa66a

drivers/gpu/drm/i915/i915_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -3492,8 +3492,6 @@ mkwrite_device_info(struct drm_i915_private *dev_priv) 
extern void intel_modeset_init_hw(struct drm_device *dev);

extern int intel_modeset_init(struct drm_device *dev);

extern void intel_modeset_cleanup(struct drm_device *dev);

extern int intel_connector_register(struct drm_connector *);

extern void intel_connector_unregister(struct drm_connector *);

extern int intel_modeset_vga_set_state(struct drm_i915_private *dev_priv,

				       bool state);

extern void intel_display_resume(struct drm_device *dev);

drivers/gpu/drm/i915/intel_connector.c

+110 −0
Original line number Diff line number Diff line
@@ -25,11 +25,121 @@ 


#include <linux/slab.h>

#include <linux/i2c.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_edid.h>

#include <drm/drmP.h>

#include "intel_drv.h"

#include "i915_drv.h"



int intel_connector_init(struct intel_connector *connector)

{

	struct intel_digital_connector_state *conn_state;



	/*

	 * Allocate enough memory to hold intel_digital_connector_state,

	 * This might be a few bytes too many, but for connectors that don't

	 * need it we'll free the state and allocate a smaller one on the first

	 * successful commit anyway.

	 */

	conn_state = kzalloc(sizeof(*conn_state), GFP_KERNEL);

	if (!conn_state)

		return -ENOMEM;



	__drm_atomic_helper_connector_reset(&connector->base,

					    &conn_state->base);



	return 0;

}



struct intel_connector *intel_connector_alloc(void)

{

	struct intel_connector *connector;



	connector = kzalloc(sizeof(*connector), GFP_KERNEL);

	if (!connector)

		return NULL;



	if (intel_connector_init(connector) < 0) {

		kfree(connector);

		return NULL;

	}



	return connector;

}



/*

 * Free the bits allocated by intel_connector_alloc.

 * This should only be used after intel_connector_alloc has returned

 * successfully, and before drm_connector_init returns successfully.

 * Otherwise the destroy callbacks for the connector and the state should

 * take care of proper cleanup/free (see intel_connector_destroy).

 */

void intel_connector_free(struct intel_connector *connector)

{

	kfree(to_intel_digital_connector_state(connector->base.state));

	kfree(connector);

}



/*

 * Connector type independent destroy hook for drm_connector_funcs.

 */

void intel_connector_destroy(struct drm_connector *connector)

{

	struct intel_connector *intel_connector = to_intel_connector(connector);



	kfree(intel_connector->detect_edid);



	if (!IS_ERR_OR_NULL(intel_connector->edid))

		kfree(intel_connector->edid);



	intel_panel_fini(&intel_connector->panel);



	drm_connector_cleanup(connector);

	kfree(connector);

}



int intel_connector_register(struct drm_connector *connector)

{

	struct intel_connector *intel_connector = to_intel_connector(connector);

	int ret;



	ret = intel_backlight_device_register(intel_connector);

	if (ret)

		goto err;



	return 0;



err:

	return ret;

}



void intel_connector_unregister(struct drm_connector *connector)

{

	struct intel_connector *intel_connector = to_intel_connector(connector);



	intel_backlight_device_unregister(intel_connector);

}



void intel_connector_attach_encoder(struct intel_connector *connector,

				    struct intel_encoder *encoder)

{

	connector->encoder = encoder;

	drm_connector_attach_encoder(&connector->base, &encoder->base);

}



/*

 * Simple connector->get_hw_state implementation for encoders that support only

 * one connector and no cloning and hence the encoder state determines the state

 * of the connector.

 */

bool intel_connector_get_hw_state(struct intel_connector *connector)

{

	enum pipe pipe = 0;

	struct intel_encoder *encoder = connector->encoder;



	return encoder->get_hw_state(encoder, &pipe);

}



/**

 * intel_connector_update_modes - update connector from edid

 * @connector: DRM connector device to use

drivers/gpu/drm/i915/intel_display.c

+0 −107
Original line number Diff line number Diff line
@@ -6324,84 +6324,6 @@ static void intel_connector_verify_state(struct drm_crtc_state *crtc_state, 
	}

}



int intel_connector_init(struct intel_connector *connector)

{

	struct intel_digital_connector_state *conn_state;



	/*

	 * Allocate enough memory to hold intel_digital_connector_state,

	 * This might be a few bytes too many, but for connectors that don't

	 * need it we'll free the state and allocate a smaller one on the first

	 * succesful commit anyway.

	 */

	conn_state = kzalloc(sizeof(*conn_state), GFP_KERNEL);

	if (!conn_state)

		return -ENOMEM;



	__drm_atomic_helper_connector_reset(&connector->base,

					    &conn_state->base);



	return 0;

}



struct intel_connector *intel_connector_alloc(void)

{

	struct intel_connector *connector;



	connector = kzalloc(sizeof *connector, GFP_KERNEL);

	if (!connector)

		return NULL;



	if (intel_connector_init(connector) < 0) {

		kfree(connector);

		return NULL;

	}



	return connector;

}



/*

 * Free the bits allocated by intel_connector_alloc.

 * This should only be used after intel_connector_alloc has returned

 * successfully, and before drm_connector_init returns successfully.

 * Otherwise the destroy callbacks for the connector and the state should

 * take care of proper cleanup/free (see intel_connector_destroy).

 */

void intel_connector_free(struct intel_connector *connector)

{

	kfree(to_intel_digital_connector_state(connector->base.state));

	kfree(connector);

}



/*

 * Connector type independent destroy hook for drm_connector_funcs.

 */

void intel_connector_destroy(struct drm_connector *connector)

{

	struct intel_connector *intel_connector = to_intel_connector(connector);



	kfree(intel_connector->detect_edid);



	if (!IS_ERR_OR_NULL(intel_connector->edid))

		kfree(intel_connector->edid);



	intel_panel_fini(&intel_connector->panel);



	drm_connector_cleanup(connector);

	kfree(connector);

}



/* Simple connector->get_hw_state implementation for encoders that support only

 * one connector and no cloning and hence the encoder state determines the state

 * of the connector. */

bool intel_connector_get_hw_state(struct intel_connector *connector)

{

	enum pipe pipe = 0;

	struct intel_encoder *encoder = connector->encoder;



	return encoder->get_hw_state(encoder, &pipe);

}



static int pipe_required_fdi_lanes(struct intel_crtc_state *crtc_state)

{

	if (crtc_state->base.enable && crtc_state->has_pch_encoder)
@@ -15858,28 +15780,6 @@ void intel_display_resume(struct drm_device *dev) 
		drm_atomic_state_put(state);

}



int intel_connector_register(struct drm_connector *connector)

{

	struct intel_connector *intel_connector = to_intel_connector(connector);

	int ret;



	ret = intel_backlight_device_register(intel_connector);

	if (ret)

		goto err;



	return 0;



err:

	return ret;

}



void intel_connector_unregister(struct drm_connector *connector)

{

	struct intel_connector *intel_connector = to_intel_connector(connector);



	intel_backlight_device_unregister(intel_connector);

}



static void intel_hpd_poll_fini(struct drm_device *dev)

{

	struct intel_connector *connector;
@@ -15939,13 +15839,6 @@ void intel_modeset_cleanup(struct drm_device *dev) 
	destroy_workqueue(dev_priv->modeset_wq);

}



void intel_connector_attach_encoder(struct intel_connector *connector,

				    struct intel_encoder *encoder)

{

	connector->encoder = encoder;

	drm_connector_attach_encoder(&connector->base, &encoder->base);

}



/*

 * set vga decode state - true == enable VGA decode

 */

drivers/gpu/drm/i915/intel_drv.h

+9 −7
Original line number Diff line number Diff line
@@ -1507,13 +1507,6 @@ void intel_mark_idle(struct drm_i915_private *dev_priv); 
int intel_display_suspend(struct drm_device *dev);

void intel_pps_unlock_regs_wa(struct drm_i915_private *dev_priv);

void intel_encoder_destroy(struct drm_encoder *encoder);

int intel_connector_init(struct intel_connector *);

struct intel_connector *intel_connector_alloc(void);

void intel_connector_free(struct intel_connector *connector);

void intel_connector_destroy(struct drm_connector *connector);

bool intel_connector_get_hw_state(struct intel_connector *connector);

void intel_connector_attach_encoder(struct intel_connector *connector,

				    struct intel_encoder *encoder);

struct drm_display_mode *

intel_encoder_current_mode(struct intel_encoder *encoder);

bool intel_port_is_tc(struct drm_i915_private *dev_priv, enum port port);
@@ -1669,6 +1662,15 @@ unsigned int i9xx_plane_max_stride(struct intel_plane *plane, 
				   unsigned int rotation);



/* intel_connector.c */

int intel_connector_init(struct intel_connector *connector);

struct intel_connector *intel_connector_alloc(void);

void intel_connector_free(struct intel_connector *connector);

void intel_connector_destroy(struct drm_connector *connector);

int intel_connector_register(struct drm_connector *connector);

void intel_connector_unregister(struct drm_connector *connector);

void intel_connector_attach_encoder(struct intel_connector *connector,

				    struct intel_encoder *encoder);

bool intel_connector_get_hw_state(struct intel_connector *connector);

int intel_connector_update_modes(struct drm_connector *connector,

				 struct edid *edid);

int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter);

CRA Git | Maintained and supported by SUSTech CRA and CCSE