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

Commit d112a816 authored by Zhao Yakui's avatar Zhao Yakui Committed by Dave Airlie
Browse files

gma500/cdv: Add eDP support 



Introduce the eDP support into the driver.

This has been reworked a bit because kernel driver proper uses encoder/connectors
while the legacy Intel driver uses the old output stuff.

It also diverges on the backlight handling. The legacy Intel driver adds a panel
abstraction based upon the i915 one. It's only really used for backlight bits
and we have a perfectly good backlight abstraction which can extend instead.

Signed-off-by: default avatarZhao Yakui <yakui.zhao@intel.com>
[ported to upstream driver, redid backlight abstraction]
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 35659715

drivers/gpu/drm/gma500/backlight.c

+45 −0
Original line number Diff line number Diff line
@@ -26,10 +26,55 @@ 
#include "intel_bios.h"

#include "power.h"



static void do_gma_backlight_set(struct drm_device *dev)

{

#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE

	struct drm_psb_private *dev_priv = dev->dev_private;

	backlight_update_status(dev_priv->backlight_device);

#endif	

}



void gma_backlight_enable(struct drm_device *dev)

{

#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE

	struct drm_psb_private *dev_priv = dev->dev_private;

	dev_priv->backlight_enabled = true;

	if (dev_priv->backlight_device) {

		dev_priv->backlight_device->props.brightness = dev_priv->backlight_level;

		do_gma_backlight_set(dev);

	}

#endif	

}



void gma_backlight_disable(struct drm_device *dev)

{

#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE

	struct drm_psb_private *dev_priv = dev->dev_private;

	dev_priv->backlight_enabled = false;

	if (dev_priv->backlight_device) {

		dev_priv->backlight_device->props.brightness = 0;

		do_gma_backlight_set(dev);

	}

#endif	

}



void gma_backlight_set(struct drm_device *dev, int v)

{

#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE

	struct drm_psb_private *dev_priv = dev->dev_private;

	dev_priv->backlight_level = v;

	if (dev_priv->backlight_device && dev_priv->backlight_enabled) {

		dev_priv->backlight_device->props.brightness = v;

		do_gma_backlight_set(dev);

	}

#endif	

}



int gma_backlight_init(struct drm_device *dev)

{

#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE

	struct drm_psb_private *dev_priv = dev->dev_private;

	dev_priv->backlight_enabled = true;

	return dev_priv->ops->backlight_init(dev);

#else

	return 0;

drivers/gpu/drm/gma500/cdv_device.c

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ static int cdv_backlight_init(struct drm_device *dev) 
			cdv_get_brightness(cdv_backlight_device);

	backlight_update_status(cdv_backlight_device);

	dev_priv->backlight_device = cdv_backlight_device;

	dev_priv->backlight_enabled = true;

	return 0;

}

drivers/gpu/drm/gma500/cdv_intel_display.c

+40 −2
Original line number Diff line number Diff line
@@ -438,7 +438,8 @@ static const struct cdv_intel_limit_t *cdv_intel_limit(struct drm_crtc *crtc, 
			limit = &cdv_intel_limits[CDV_LIMIT_SINGLE_LVDS_96];

		else

			limit = &cdv_intel_limits[CDV_LIMIT_SINGLE_LVDS_100];

	} else if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT)) {

	} else if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT) ||

			psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_EDP)) {

		if (refclk == 27000)

			limit = &cdv_intel_limits[CDV_LIMIT_DP_27];

		else
@@ -1045,6 +1046,7 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc, 
	struct drm_connector *connector;

	const struct cdv_intel_limit_t *limit;

	u32 ddi_select = 0;

	bool is_edp = false;



	list_for_each_entry(connector, &mode_config->connector_list, head) {

		struct psb_intel_encoder *psb_intel_encoder =
@@ -1071,6 +1073,9 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc, 
		case INTEL_OUTPUT_DISPLAYPORT:

			is_dp = true;

			break;

		case INTEL_OUTPUT_EDP:

			is_edp = true;

			break;

		default:

			DRM_ERROR("invalid output type.\n");

			return 0;
@@ -1083,7 +1088,15 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc, 
	else

		/* high-end sku, 27/100 mhz */

		refclk = 27000;

	if (is_dp) {

	if (is_dp || is_edp) {

		/*

		 * Based on the spec the low-end SKU has only CRT/LVDS. So it is

		 * unnecessary to consider it for DP/eDP.

		 * On the high-end SKU, it will use the 27/100M reference clk

		 * for DP/eDP. When using SSC clock, the ref clk is 100MHz.Otherwise

		 * it will be 27MHz. From the VBIOS code it seems that the pipe A choose

		 * 27MHz for DP/eDP while the Pipe B chooses the 100MHz.

		 */ 

		if (pipe == 0)

			refclk = 27000;

		else
@@ -1133,6 +1146,31 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc, 
	/* setup pipeconf */

	pipeconf = REG_READ(map->conf);



	pipeconf &= ~(PIPE_BPC_MASK);

	if (is_edp) {

		switch (dev_priv->edp.bpp) {

		case 24:

			pipeconf |= PIPE_8BPC;

			break;

		case 18:

			pipeconf |= PIPE_6BPC;

			break;

		case 30:

			pipeconf |= PIPE_10BPC;

			break;

		default:

			pipeconf |= PIPE_8BPC;

			break;

		}

	} else if (is_lvds) {

		/* the BPC will be 6 if it is 18-bit LVDS panel */

		if ((REG_READ(LVDS) & LVDS_A3_POWER_MASK) == LVDS_A3_POWER_UP)

			pipeconf |= PIPE_8BPC;

		else

			pipeconf |= PIPE_6BPC;

	} else

		pipeconf |= PIPE_8BPC;

			

	/* Set up the display plane register */

	dspcntr = DISPPLANE_GAMMA_ENABLE;

drivers/gpu/drm/gma500/cdv_intel_dp.c

+448 −20

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/gma500/cdv_intel_lvds.c

+2 −10
Original line number Diff line number Diff line
@@ -506,16 +506,8 @@ static int cdv_intel_lvds_set_property(struct drm_connector *connector, 
							property,

							value))

			return -1;

		else {

#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE

			struct drm_psb_private *dev_priv =

						encoder->dev->dev_private;

			struct backlight_device *bd =

						dev_priv->backlight_device;

			bd->props.brightness = value;

			backlight_update_status(bd);

#endif

		}

		else

                        gma_backlight_set(encoder->dev, value);

	} else if (!strcmp(property->name, "DPMS") && encoder) {

		struct drm_encoder_helper_funcs *helpers =

					encoder->helper_private;