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

Commit 01db3639 authored by Francisco Jerez's avatar Francisco Jerez Committed by Ben Skeggs
Browse files

drm/nouveau: Use "force" to decide if analog load detection is ok or not. 



Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 5794b5fd

drivers/gpu/drm/nouveau/nouveau_connector.c

+28 −41
Original line number Diff line number Diff line
@@ -213,6 +213,24 @@ nouveau_connector_set_encoder(struct drm_connector *connector, 
	}

}



static bool

nouveau_connector_poll_allowed(struct drm_connector *connector)

{

	struct drm_device *dev = connector->dev;

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct drm_crtc *crtc;

	bool spare_crtc = false;



	if (dev_priv->card_type >= NV_50) {

		return true;

	} else {

		list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)

			spare_crtc |= !crtc->enabled;



		return spare_crtc;

	}

}



static enum drm_connector_status

nouveau_connector_detect(struct drm_connector *connector, bool force)

{
@@ -281,7 +299,8 @@ nouveau_connector_detect(struct drm_connector *connector, bool force) 
	nv_encoder = find_encoder_by_type(connector, OUTPUT_ANALOG);

	if (!nv_encoder && !nouveau_tv_disable)

		nv_encoder = find_encoder_by_type(connector, OUTPUT_TV);

	if (nv_encoder) {

	if (nv_encoder &&

	    (force || nouveau_connector_poll_allowed(connector))) {

		struct drm_encoder *encoder = to_drm_encoder(nv_encoder);

		struct drm_encoder_helper_funcs *helper =

						encoder->helper_private;
@@ -724,44 +743,6 @@ nouveau_connector_best_encoder(struct drm_connector *connector) 
	return NULL;

}



void

nouveau_connector_set_polling(struct drm_connector *connector)

{

	struct drm_device *dev = connector->dev;

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct drm_crtc *crtc;

	bool spare_crtc = false;



	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)

		spare_crtc |= !crtc->enabled;



	connector->polled = 0;



	switch (connector->connector_type) {

	case DRM_MODE_CONNECTOR_VGA:

	case DRM_MODE_CONNECTOR_TV:

		if (dev_priv->card_type >= NV_50 ||

		    (nv_gf4_disp_arch(dev) && spare_crtc))

			connector->polled = DRM_CONNECTOR_POLL_CONNECT;

		break;



	case DRM_MODE_CONNECTOR_DVII:

	case DRM_MODE_CONNECTOR_DVID:

	case DRM_MODE_CONNECTOR_HDMIA:

	case DRM_MODE_CONNECTOR_DisplayPort:

	case DRM_MODE_CONNECTOR_eDP:

		if (dev_priv->card_type >= NV_50)

			connector->polled = DRM_CONNECTOR_POLL_HPD;

		else if (connector->connector_type == DRM_MODE_CONNECTOR_DVID ||

			 spare_crtc)

			connector->polled = DRM_CONNECTOR_POLL_CONNECT;

		break;



	default:

		break;

	}

}



static const struct drm_connector_helper_funcs

nouveau_connector_helper_funcs = {

	.get_modes = nouveau_connector_get_modes,
@@ -892,6 +873,9 @@ nouveau_connector_create(struct drm_device *dev, int index) 
	case DCB_CONNECTOR_TV_1:

	case DCB_CONNECTOR_TV_3:

		nv_connector->scaling_mode = DRM_MODE_SCALE_NONE;



		if (nv_gf4_disp_arch(dev))

			connector->polled = DRM_CONNECTOR_POLL_CONNECT;

		break;

	default:

		nv_connector->scaling_mode = DRM_MODE_SCALE_FULLSCREEN;
@@ -903,11 +887,14 @@ nouveau_connector_create(struct drm_device *dev, int index) 
				dev->mode_config.dithering_mode_property,

				nv_connector->use_dithering ?

				DRM_MODE_DITHERING_ON : DRM_MODE_DITHERING_OFF);



		if (dev_priv->card_type >= NV_50)

			connector->polled = DRM_CONNECTOR_POLL_HPD;

		else

			connector->polled = DRM_CONNECTOR_POLL_CONNECT;

		break;

	}



	nouveau_connector_set_polling(connector);



	drm_sysfs_connector_add(connector);

	dcb->drm = connector;

	return dcb->drm;

drivers/gpu/drm/nouveau/nouveau_connector.h

+0 −3
Original line number Diff line number Diff line
@@ -52,9 +52,6 @@ static inline struct nouveau_connector *nouveau_connector( 
struct drm_connector *

nouveau_connector_create(struct drm_device *, int index);



void

nouveau_connector_set_polling(struct drm_connector *);



int

nouveau_connector_bpp(struct drm_connector *);

drivers/gpu/drm/nouveau/nv04_crtc.c

+0 −5
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ nv_crtc_dpms(struct drm_crtc *crtc, int mode) 
{

	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);

	struct drm_device *dev = crtc->dev;

	struct drm_connector *connector;

	unsigned char seq1 = 0, crtc17 = 0;

	unsigned char crtc1A;
@@ -213,10 +212,6 @@ nv_crtc_dpms(struct drm_crtc *crtc, int mode) 
	NVVgaSeqReset(dev, nv_crtc->index, false);



	NVWriteVgaCrtc(dev, nv_crtc->index, NV_CIO_CRE_RPC1_INDEX, crtc1A);



	/* Update connector polling modes */

	list_for_each_entry(connector, &dev->mode_config.connector_list, head)

		nouveau_connector_set_polling(connector);

}



static bool