drm/nouveau/dp: remove broken display depth function, use the improved one (d4c2c99b) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/gpu/drm/nouveau/nouveau_connector.c

+12 −22

Original line number	Original line	Diff line number	Diff line
	@@ -78,23 +78,6 @@ nouveau_encoder_connector_get(struct nouveau_encoder *encoder)
	return NULL;		return NULL;
	}		}

	/*TODO: This could use improvement, and learn to handle the fixed
	* BIOS tables etc. It's fine currently, for its only user.
	*/
	int
	nouveau_connector_bpp(struct drm_connector *connector)
	{
	struct nouveau_connector *nv_connector = nouveau_connector(connector);

	if (nv_connector->edid && nv_connector->edid->revision >= 4) {
	u8 bpc = ((nv_connector->edid->input & 0x70) >> 3) + 4;
	if (bpc > 4)
	return bpc;
	}

	return 18;
	}

	static void		static void
	nouveau_connector_destroy(struct drm_connector *connector)		nouveau_connector_destroy(struct drm_connector *connector)
	{		{
	@@ -714,6 +697,12 @@ nouveau_connector_get_modes(struct drm_connector *connector)
	nv_connector->native_mode = drm_mode_duplicate(dev, &mode);		nv_connector->native_mode = drm_mode_duplicate(dev, &mode);
	}		}

			/* Determine display colour depth for everything except LVDS now,
			* DP requires this before mode_valid() is called.
			*/
			if (connector->connector_type != DRM_MODE_CONNECTOR_LVDS)
			nouveau_connector_detect_depth(connector);

	/* Find the native mode if this is a digital panel, if we didn't		/* Find the native mode if this is a digital panel, if we didn't
	* find any modes through DDC previously add the native mode to		* find any modes through DDC previously add the native mode to
	* the list of modes.		* the list of modes.
	@@ -729,10 +718,11 @@ nouveau_connector_get_modes(struct drm_connector *connector)
	ret = 1;		ret = 1;
	}		}

	/* Attempt to determine display colour depth, this has to happen after		/* Determine LVDS colour depth, must happen after determining
	* we've determined the "native" mode for LVDS, as the VBIOS tables		* "native" mode as some VBIOS tables require us to use the
	* require us to compare against a pixel clock in some cases..		* pixel clock as part of the lookup...
	*/		*/
			if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS)
	nouveau_connector_detect_depth(connector);		nouveau_connector_detect_depth(connector);

	if (nv_encoder->dcb->type == OUTPUT_TV)		if (nv_encoder->dcb->type == OUTPUT_TV)
	@@ -799,7 +789,7 @@ nouveau_connector_mode_valid(struct drm_connector *connector,
	case OUTPUT_DP:		case OUTPUT_DP:
	max_clock = nv_encoder->dp.link_nr;		max_clock = nv_encoder->dp.link_nr;
	max_clock *= nv_encoder->dp.link_bw;		max_clock *= nv_encoder->dp.link_bw;
	clock = clock * nouveau_connector_bpp(connector) / 10;		clock = clock * (connector->display_info.bpc * 3) / 10;
	break;		break;
	default:		default:
	BUG_ON(1);		BUG_ON(1);