Commit 4ef69c7a authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Rename intel_encoder->enc to base for consistency 



[Patch is slightly larger than is strictly necessary to fixup
surrounding checkpatch.pl errors.]

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 1af5fa1b

drivers/gpu/drm/i915/i915_irq.c

+6 −10
Original line number Diff line number Diff line
@@ -260,16 +260,12 @@ static void i915_hotplug_work_func(struct work_struct *work) 
						    hotplug_work);

	struct drm_device *dev = dev_priv->dev;

	struct drm_mode_config *mode_config = &dev->mode_config;

	struct drm_encoder *encoder;

	struct intel_encoder *encoder;



	if (mode_config->num_encoder) {

		list_for_each_entry(encoder, &mode_config->encoder_list, head) {

			struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);

	list_for_each_entry(encoder, &mode_config->encoder_list, base.head)

		if (encoder->hot_plug)

			encoder->hot_plug(encoder);



			if (intel_encoder->hot_plug)

				(*intel_encoder->hot_plug) (intel_encoder);

		}

	}

	/* Just fire off a uevent and let userspace tell us what to do */

	drm_helper_hpd_irq_event(dev);

}

drivers/gpu/drm/i915/intel_crt.c

+7 −7
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector) 


static bool intel_crt_detect_ddc(struct drm_encoder *encoder)

{

	struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);

	struct intel_encoder *intel_encoder = to_intel_encoder(encoder);



	/* CRT should always be at 0, but check anyway */

	if (intel_encoder->type != INTEL_OUTPUT_ANALOG)
@@ -275,7 +275,7 @@ static bool intel_crt_detect_ddc(struct drm_encoder *encoder) 
static enum drm_connector_status

intel_crt_load_detect(struct drm_crtc *crtc, struct intel_encoder *intel_encoder)

{

	struct drm_encoder *encoder = &intel_encoder->enc;

	struct drm_encoder *encoder = &intel_encoder->base;

	struct drm_device *dev = encoder->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -405,7 +405,7 @@ static enum drm_connector_status intel_crt_detect(struct drm_connector *connecto 
{

	struct drm_device *dev = connector->dev;

	struct drm_encoder *encoder = intel_attached_encoder(connector);

	struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);

	struct intel_encoder *intel_encoder = to_intel_encoder(encoder);

	struct drm_crtc *crtc;

	int dpms_mode;

	enum drm_connector_status status;
@@ -448,7 +448,7 @@ static int intel_crt_get_modes(struct drm_connector *connector) 
{

	int ret;

	struct drm_encoder *encoder = intel_attached_encoder(connector);

	struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);

	struct intel_encoder *intel_encoder = to_intel_encoder(encoder);

	struct i2c_adapter *ddc_bus;

	struct drm_device *dev = connector->dev;
@@ -533,11 +533,11 @@ void intel_crt_init(struct drm_device *dev) 
	drm_connector_init(dev, &intel_connector->base,

			   &intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);



	drm_encoder_init(dev, &intel_encoder->enc, &intel_crt_enc_funcs,

	drm_encoder_init(dev, &intel_encoder->base, &intel_crt_enc_funcs,

			 DRM_MODE_ENCODER_DAC);



	drm_mode_connector_attach_encoder(&intel_connector->base,

					  &intel_encoder->enc);

					  &intel_encoder->base);



	/* Set up the DDC bus. */

	if (HAS_PCH_SPLIT(dev))
@@ -563,7 +563,7 @@ void intel_crt_init(struct drm_device *dev) 
	connector->interlace_allowed = 1;

	connector->doublescan_allowed = 0;



	drm_encoder_helper_add(&intel_encoder->enc, &intel_crt_helper_funcs);

	drm_encoder_helper_add(&intel_encoder->base, &intel_crt_helper_funcs);

	drm_connector_helper_add(connector, &intel_crt_connector_helper_funcs);



	drm_sysfs_connector_add(connector);

drivers/gpu/drm/i915/intel_display.c

+23 −29
Original line number Diff line number Diff line
@@ -748,15 +748,12 @@ bool intel_pipe_has_type (struct drm_crtc *crtc, int type) 
{

	struct drm_device *dev = crtc->dev;

	struct drm_mode_config *mode_config = &dev->mode_config;

    struct drm_encoder *l_entry;

	struct intel_encoder *encoder;



    list_for_each_entry(l_entry, &mode_config->encoder_list, head) {

	    if (l_entry && l_entry->crtc == crtc) {

		    struct intel_encoder *intel_encoder = enc_to_intel_encoder(l_entry);

		    if (intel_encoder->type == type)

	list_for_each_entry(encoder, &mode_config->encoder_list, base.head)

		if (encoder->base.crtc == crtc && encoder->type == type)

			return true;

	    }

    }



	return false;

}
@@ -2459,7 +2456,7 @@ void intel_encoder_commit (struct drm_encoder *encoder) 


void intel_encoder_destroy(struct drm_encoder *encoder)

{

	struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);

	struct intel_encoder *intel_encoder = to_intel_encoder(encoder);



	if (intel_encoder->ddc_bus)

		intel_i2c_destroy(intel_encoder->ddc_bus);
@@ -3540,7 +3537,7 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc, 
		if (encoder->crtc != crtc)

			continue;



		intel_encoder = enc_to_intel_encoder(encoder);

		intel_encoder = to_intel_encoder(encoder);

		switch (intel_encoder->type) {

		case INTEL_OUTPUT_LVDS:

			is_lvds = true;
@@ -4430,7 +4427,7 @@ struct drm_crtc *intel_get_load_detect_pipe(struct intel_encoder *intel_encoder, 
	struct intel_crtc *intel_crtc;

	struct drm_crtc *possible_crtc;

	struct drm_crtc *supported_crtc =NULL;

	struct drm_encoder *encoder = &intel_encoder->enc;

	struct drm_encoder *encoder = &intel_encoder->base;

	struct drm_crtc *crtc = NULL;

	struct drm_device *dev = encoder->dev;

	struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private;
@@ -4511,7 +4508,7 @@ struct drm_crtc *intel_get_load_detect_pipe(struct intel_encoder *intel_encoder, 
void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder,

				    struct drm_connector *connector, int dpms_mode)

{

	struct drm_encoder *encoder = &intel_encoder->enc;

	struct drm_encoder *encoder = &intel_encoder->base;

	struct drm_device *dev = encoder->dev;

	struct drm_crtc *crtc = encoder->crtc;

	struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private;
@@ -5243,24 +5240,23 @@ struct drm_crtc *intel_get_crtc_from_pipe(struct drm_device *dev, int pipe) 


static int intel_encoder_clones(struct drm_device *dev, int type_mask)

{

	struct intel_encoder *encoder;

	int index_mask = 0;

	struct drm_encoder *encoder;

	int entry = 0;



        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {

		struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);

		if (type_mask & intel_encoder->clone_mask)

	list_for_each_entry(encoder, &dev->mode_config.encoder_list, base.head) {

		if (type_mask & encoder->clone_mask)

			index_mask |= (1 << entry);

		entry++;

	}



	return index_mask;

}





static void intel_setup_outputs(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_encoder *encoder;

	struct intel_encoder *encoder;

	bool dpd_is_edp = false;



	if (IS_MOBILE(dev) && !IS_I830(dev))
@@ -5349,12 +5345,10 @@ static void intel_setup_outputs(struct drm_device *dev) 
	if (SUPPORTS_TV(dev))

		intel_tv_init(dev);



	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {

		struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);



		encoder->possible_crtcs = intel_encoder->crtc_mask;

		encoder->possible_clones = intel_encoder_clones(dev,

						intel_encoder->clone_mask);

	list_for_each_entry(encoder, &dev->mode_config.encoder_list, base.head) {

		encoder->base.possible_crtcs = encoder->crtc_mask;

		encoder->base.possible_clones =

			intel_encoder_clones(dev, encoder->clone_mask);

	}

}

drivers/gpu/drm/i915/intel_dp.c

+14 −14
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ struct intel_dp { 


static struct intel_dp *enc_to_intel_dp(struct drm_encoder *encoder)

{

	return container_of(enc_to_intel_encoder(encoder), struct intel_dp, base);

	return container_of(encoder, struct intel_dp, base.base);

}



static void intel_dp_start_link_train(struct intel_dp *intel_dp);
@@ -236,7 +236,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, 
		uint8_t *recv, int recv_size)

{

	uint32_t output_reg = intel_dp->output_reg;

	struct drm_device *dev = intel_dp->base.enc.dev;

	struct drm_device *dev = intel_dp->base.base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	uint32_t ch_ctl = output_reg + 0x10;

	uint32_t ch_data = ch_ctl + 4;
@@ -704,7 +704,7 @@ intel_dp_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, 
{

	struct drm_device *dev = encoder->dev;

	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);

	struct drm_crtc *crtc = intel_dp->base.enc.crtc;

	struct drm_crtc *crtc = intel_dp->base.base.crtc;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);



	intel_dp->DP = (DP_VOLTAGE_0_4 |
@@ -1174,9 +1174,9 @@ intel_dp_set_link_train(struct intel_dp *intel_dp, 
			uint8_t dp_train_pat,

			bool first)

{

	struct drm_device *dev = intel_dp->base.enc.dev;

	struct drm_device *dev = intel_dp->base.base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(intel_dp->base.enc.crtc);

	struct intel_crtc *intel_crtc = to_intel_crtc(intel_dp->base.base.crtc);

	int ret;



	I915_WRITE(intel_dp->output_reg, dp_reg_value);
@@ -1200,7 +1200,7 @@ intel_dp_set_link_train(struct intel_dp *intel_dp, 
static void

intel_dp_start_link_train(struct intel_dp *intel_dp)

{

	struct drm_device *dev = intel_dp->base.enc.dev;

	struct drm_device *dev = intel_dp->base.base.dev;

	int i;

	uint8_t voltage;

	bool clock_recovery = false;
@@ -1280,7 +1280,7 @@ intel_dp_start_link_train(struct intel_dp *intel_dp) 
static void

intel_dp_complete_link_train(struct intel_dp *intel_dp)

{

	struct drm_device *dev = intel_dp->base.enc.dev;

	struct drm_device *dev = intel_dp->base.base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	bool channel_eq = false;

	int tries;
@@ -1345,7 +1345,7 @@ intel_dp_complete_link_train(struct intel_dp *intel_dp) 
static void

intel_dp_link_down(struct intel_dp *intel_dp)

{

	struct drm_device *dev = intel_dp->base.enc.dev;

	struct drm_device *dev = intel_dp->base.base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	uint32_t DP = intel_dp->DP;
@@ -1388,7 +1388,7 @@ intel_dp_link_down(struct intel_dp *intel_dp) 
static void

intel_dp_check_link_status(struct intel_dp *intel_dp)

{

	if (!intel_dp->base.enc.crtc)

	if (!intel_dp->base.base.crtc)

		return;



	if (!intel_dp_get_link_status(intel_dp)) {
@@ -1438,7 +1438,7 @@ intel_dp_detect(struct drm_connector *connector) 
{

	struct drm_encoder *encoder = intel_attached_encoder(connector);

	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);

	struct drm_device *dev = intel_dp->base.enc.dev;

	struct drm_device *dev = intel_dp->base.base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	uint32_t temp, bit;

	enum drm_connector_status status;
@@ -1482,7 +1482,7 @@ static int intel_dp_get_modes(struct drm_connector *connector) 
{

	struct drm_encoder *encoder = intel_attached_encoder(connector);

	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);

	struct drm_device *dev = intel_dp->base.enc.dev;

	struct drm_device *dev = intel_dp->base.base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	int ret;
@@ -1670,12 +1670,12 @@ intel_dp_init(struct drm_device *dev, int output_reg) 
	intel_dp->has_audio = false;

	intel_dp->dpms_mode = DRM_MODE_DPMS_ON;



	drm_encoder_init(dev, &intel_encoder->enc, &intel_dp_enc_funcs,

	drm_encoder_init(dev, &intel_encoder->base, &intel_dp_enc_funcs,

			 DRM_MODE_ENCODER_TMDS);

	drm_encoder_helper_add(&intel_encoder->enc, &intel_dp_helper_funcs);

	drm_encoder_helper_add(&intel_encoder->base, &intel_dp_helper_funcs);



	drm_mode_connector_attach_encoder(&intel_connector->base,

					  &intel_encoder->enc);

					  &intel_encoder->base);

	drm_sysfs_connector_add(connector);



	/* Set up the DDC bus. */

drivers/gpu/drm/i915/intel_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ struct intel_fbdev { 
};



struct intel_encoder {

	struct drm_encoder enc;

	struct drm_encoder base;

	int type;

	struct i2c_adapter *i2c_bus;

	struct i2c_adapter *ddc_bus;
@@ -174,7 +174,7 @@ struct intel_crtc { 


#define to_intel_crtc(x) container_of(x, struct intel_crtc, base)

#define to_intel_connector(x) container_of(x, struct intel_connector, base)

#define enc_to_intel_encoder(x) container_of(x, struct intel_encoder, enc)

#define to_intel_encoder(x) container_of(x, struct intel_encoder, base)

#define to_intel_framebuffer(x) container_of(x, struct intel_framebuffer, base)



struct intel_unpin_work {