Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f254ec2 authored by Zhenyu Wang's avatar Zhenyu Wang Committed by Eric Anholt
Browse files

drm/i915: remove connector object in old output structure 



As all display drivers have been converted, remove the left reference
for connector object in old structure.

Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
parent 0c41ee2b

drivers/gpu/drm/i915/intel_display.c

+0 −10
Original line number Diff line number Diff line
@@ -5238,16 +5238,6 @@ void intel_modeset_cleanup(struct drm_device *dev) 
}





/* current intel driver doesn't take advantage of encoders

   always give back the encoder for the connector

*/

struct drm_encoder *intel_best_encoder(struct drm_connector *connector)

{

	struct intel_encoder *intel_encoder = to_intel_encoder(connector);



	return &intel_encoder->enc;

}



/*

 * Return which encoder is currently attached for connector.

 */

drivers/gpu/drm/i915/intel_drv.h

+0 −4
Original line number Diff line number Diff line
@@ -96,8 +96,6 @@ struct intel_framebuffer { 




struct intel_encoder {

	struct drm_connector base;



	struct drm_encoder enc;

	int type;

	struct i2c_adapter *i2c_bus;
@@ -157,7 +155,6 @@ struct intel_crtc { 
};



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

#define to_intel_encoder(x) container_of(x, struct intel_encoder, 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_framebuffer(x) container_of(x, struct intel_framebuffer, base)
@@ -189,7 +186,6 @@ extern void intel_crtc_load_lut(struct drm_crtc *crtc); 
extern void intel_encoder_prepare (struct drm_encoder *encoder);

extern void intel_encoder_commit (struct drm_encoder *encoder);



extern struct drm_encoder *intel_best_encoder(struct drm_connector *connector);

extern struct drm_encoder *intel_attached_encoder(struct drm_connector *connector);



extern struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,