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

Commit 6d385c0a authored by Rob Clark's avatar Rob Clark Committed by Dave Airlie
Browse files

drm/nouveau: use helpers 



Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent a4cd5d68

drivers/gpu/drm/nouveau/nouveau_connector.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ find_encoder(struct drm_connector *connector, int type) 
{

{

	struct drm_device *dev = connector->dev;

	struct drm_device *dev = connector->dev;

	struct nouveau_encoder *nv_encoder;

	struct nouveau_encoder *nv_encoder;

	struct drm_mode_object *obj;

	struct drm_encoder *enc;

	int i, id;

	int i, id;





	for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {

	for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
@@ -71,10 +71,10 @@ find_encoder(struct drm_connector *connector, int type) 
		if (!id)

		if (!id)

			break;

			break;





		obj = drm_mode_object_find(dev, id, DRM_MODE_OBJECT_ENCODER);

		enc = drm_encoder_find(dev, id);

		if (!obj)

		if (!enc)

			continue;

			continue;

		nv_encoder = nouveau_encoder(obj_to_encoder(obj));

		nv_encoder = nouveau_encoder(enc);





		if (type == DCB_OUTPUT_ANY ||

		if (type == DCB_OUTPUT_ANY ||

		    (nv_encoder->dcb && nv_encoder->dcb->type == type))

		    (nv_encoder->dcb && nv_encoder->dcb->type == type))
@@ -119,7 +119,7 @@ nouveau_connector_ddc_detect(struct drm_connector *connector) 
	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nouveau_gpio *gpio = nouveau_gpio(drm->device);

	struct nouveau_gpio *gpio = nouveau_gpio(drm->device);

	struct nouveau_encoder *nv_encoder;

	struct nouveau_encoder *nv_encoder;

	struct drm_mode_object *obj;

	struct drm_encoder *encoder;

	int i, panel = -ENODEV;

	int i, panel = -ENODEV;





	/* eDP panels need powering on by us (if the VBIOS doesn't default it

	/* eDP panels need powering on by us (if the VBIOS doesn't default it
@@ -139,10 +139,10 @@ nouveau_connector_ddc_detect(struct drm_connector *connector) 
		if (id == 0)

		if (id == 0)

			break;

			break;





		obj = drm_mode_object_find(dev, id, DRM_MODE_OBJECT_ENCODER);

		encoder = drm_encoder_find(dev, id);

		if (!obj)

		if (!encoder)

			continue;

			continue;

		nv_encoder = nouveau_encoder(obj_to_encoder(obj));

		nv_encoder = nouveau_encoder(encoder);





		if (nv_encoder->dcb->type == DCB_OUTPUT_DP) {

		if (nv_encoder->dcb->type == DCB_OUTPUT_DP) {

			int ret = nouveau_dp_detect(nv_encoder);

			int ret = nouveau_dp_detect(nv_encoder);