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

Commit dde10068 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next 

some minor cleanups
* 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  drm/armada: armada_drv: Remove unused function
  drm/armada: armada_output: Remove some unused functions
parents 72a81683 38bf3aee

drivers/gpu/drm/armada/armada_drm.h

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ void armada_drm_vbl_event_add(struct armada_crtc *, 
	struct armada_vbl_event *);

void armada_drm_vbl_event_remove(struct armada_crtc *,

	struct armada_vbl_event *);

void armada_drm_vbl_event_remove_unlocked(struct armada_crtc *,

	struct armada_vbl_event *);

#define armada_drm_vbl_event_init(_e, _f, _d) do {	\

	struct armada_vbl_event *__e = _e;		\

	INIT_LIST_HEAD(&__e->node);			\

drivers/gpu/drm/armada/armada_drv.c

+0 −10
Original line number Diff line number Diff line
@@ -253,16 +253,6 @@ void armada_drm_vbl_event_remove(struct armada_crtc *dcrtc, 
	}

}



void armada_drm_vbl_event_remove_unlocked(struct armada_crtc *dcrtc,

	struct armada_vbl_event *evt)

{

	unsigned long flags;



	spin_lock_irqsave(&dcrtc->irq_lock, flags);

	armada_drm_vbl_event_remove(dcrtc, evt);

	spin_unlock_irqrestore(&dcrtc->irq_lock, flags);

}



/* These are called under the vbl_lock. */

static int armada_drm_enable_vblank(struct drm_device *dev, int crtc)

{

drivers/gpu/drm/armada/armada_output.c

+0 −16
Original line number Diff line number Diff line
@@ -72,22 +72,6 @@ static const struct drm_connector_funcs armada_drm_conn_funcs = { 
	.set_property	= armada_drm_connector_set_property,

};



void armada_drm_encoder_prepare(struct drm_encoder *encoder)

{

	encoder_helper_funcs(encoder)->dpms(encoder, DRM_MODE_DPMS_OFF);

}



void armada_drm_encoder_commit(struct drm_encoder *encoder)

{

	encoder_helper_funcs(encoder)->dpms(encoder, DRM_MODE_DPMS_ON);

}



bool armada_drm_encoder_mode_fixup(struct drm_encoder *encoder,

	const struct drm_display_mode *mode, struct drm_display_mode *adjusted)

{

	return true;

}



/* Shouldn't this be a generic helper function? */

int armada_drm_slave_encoder_mode_valid(struct drm_connector *conn,

	struct drm_display_mode *mode)

drivers/gpu/drm/armada/armada_output.h

+0 −6
Original line number Diff line number Diff line
@@ -21,12 +21,6 @@ struct armada_output_type { 


struct drm_encoder *armada_drm_connector_encoder(struct drm_connector *conn);



void armada_drm_encoder_prepare(struct drm_encoder *encoder);

void armada_drm_encoder_commit(struct drm_encoder *encoder);



bool armada_drm_encoder_mode_fixup(struct drm_encoder *encoder,

	const struct drm_display_mode *mode, struct drm_display_mode *adj);



int armada_drm_slave_encoder_mode_valid(struct drm_connector *conn,

	struct drm_display_mode *mode);