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

Commit 96ab4c70 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge branch 'bdw-fixes' into backlight-rework 



Merge the bdw changes into the backlight rework branch so that we can
adapt the new code for bdw, too.  This is a bit a mess, but doing this
another way would have delayed the merging of the backlight
refactoring. Mea culpa.

As discussed with Jani on irc only do bdw-specific callbacks for the
set/get methods and bake in the only other special-case into the pch
enable function.

Conflicts:
	drivers/gpu/drm/i915/intel_panel.c

v2: Don't enable the PWM too early for bdw (Jani).

v3: Create new bdw_ functions for setup and enable - the rules change
sufficiently imo with the switch from controlling the pwm from the cpu
to controlling it completel from the pch to warrant this.

v4: Rip out unused pipe variable in bdw_enable_backlight (0-day
builder).

Tested-by: Ben Widawsky <ben@bwidawsk.net> (on bdw)
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents 565ee389 596cc11e

drivers/gpu/drm/drm_edid.c

+8 −3
Original line number Diff line number Diff line
@@ -1329,7 +1329,7 @@ static u32 edid_get_quirks(struct edid *edid) 
}



#define MODE_SIZE(m) ((m)->hdisplay * (m)->vdisplay)

#define MODE_REFRESH_DIFF(m,r) (abs((m)->vrefresh - target_refresh))

#define MODE_REFRESH_DIFF(c,t) (abs((c) - (t)))



/**

 * edid_fixup_preferred - set preferred modes based on quirk list
@@ -1344,6 +1344,7 @@ static void edid_fixup_preferred(struct drm_connector *connector, 
{

	struct drm_display_mode *t, *cur_mode, *preferred_mode;

	int target_refresh = 0;

	int cur_vrefresh, preferred_vrefresh;



	if (list_empty(&connector->probed_modes))

		return;
@@ -1366,10 +1367,14 @@ static void edid_fixup_preferred(struct drm_connector *connector, 
		if (MODE_SIZE(cur_mode) > MODE_SIZE(preferred_mode))

			preferred_mode = cur_mode;



		cur_vrefresh = cur_mode->vrefresh ?

			cur_mode->vrefresh : drm_mode_vrefresh(cur_mode);

		preferred_vrefresh = preferred_mode->vrefresh ?

			preferred_mode->vrefresh : drm_mode_vrefresh(preferred_mode);

		/* At a given size, try to get closest to target refresh */

		if ((MODE_SIZE(cur_mode) == MODE_SIZE(preferred_mode)) &&

		    MODE_REFRESH_DIFF(cur_mode, target_refresh) <

		    MODE_REFRESH_DIFF(preferred_mode, target_refresh)) {

		    MODE_REFRESH_DIFF(cur_vrefresh, target_refresh) <

		    MODE_REFRESH_DIFF(preferred_vrefresh, target_refresh)) {

			preferred_mode = cur_mode;

		}

	}

drivers/gpu/drm/i915/i915_drv.h

+6 −1
Original line number Diff line number Diff line
@@ -1755,8 +1755,13 @@ struct drm_i915_file_private { 
#define IS_MOBILE(dev)		(INTEL_INFO(dev)->is_mobile)

#define IS_HSW_EARLY_SDV(dev)	(IS_HASWELL(dev) && \

				 ((dev)->pdev->device & 0xFF00) == 0x0C00)

#define IS_ULT(dev)		(IS_HASWELL(dev) && \

#define IS_BDW_ULT(dev)		(IS_BROADWELL(dev) && \

				 (((dev)->pdev->device & 0xf) == 0x2  || \

				 ((dev)->pdev->device & 0xf) == 0x6 || \

				 ((dev)->pdev->device & 0xf) == 0xe))

#define IS_HSW_ULT(dev)		(IS_HASWELL(dev) && \

				 ((dev)->pdev->device & 0xFF00) == 0x0A00)

#define IS_ULT(dev)		(IS_HSW_ULT(dev) || IS_BDW_ULT(dev))

#define IS_HSW_GT3(dev)		(IS_HASWELL(dev) && \

				 ((dev)->pdev->device & 0x00F0) == 0x0020)

#define IS_PRELIMINARY_HW(intel_info) ((intel_info)->is_preliminary)

drivers/gpu/drm/i915/i915_gem_gtt.c

+7 −2
Original line number Diff line number Diff line
@@ -335,8 +335,8 @@ static void gen8_ppgtt_cleanup(struct i915_address_space *vm) 
		kfree(ppgtt->gen8_pt_dma_addr[i]);

	}



	__free_pages(ppgtt->gen8_pt_pages, ppgtt->num_pt_pages << PAGE_SHIFT);

	__free_pages(ppgtt->pd_pages, ppgtt->num_pd_pages << PAGE_SHIFT);

	__free_pages(ppgtt->gen8_pt_pages, get_order(ppgtt->num_pt_pages << PAGE_SHIFT));

	__free_pages(ppgtt->pd_pages, get_order(ppgtt->num_pd_pages << PAGE_SHIFT));

}



/**
@@ -1239,6 +1239,11 @@ static inline unsigned int gen8_get_total_gtt_size(u16 bdw_gmch_ctl) 
	bdw_gmch_ctl &= BDW_GMCH_GGMS_MASK;

	if (bdw_gmch_ctl)

		bdw_gmch_ctl = 1 << bdw_gmch_ctl;

	if (bdw_gmch_ctl > 4) {

		WARN_ON(!i915_preliminary_hw_support);

		return 4<<20;

	}



	return bdw_gmch_ctl << 20;

}

drivers/gpu/drm/i915/intel_opregion.c

+2 −0
Original line number Diff line number Diff line
@@ -859,7 +859,9 @@ int intel_opregion_setup(struct drm_device *dev) 
		return -ENOTSUPP;

	}



#ifdef CONFIG_ACPI

	INIT_WORK(&opregion->asle_work, asle_work);

#endif



	base = acpi_os_ioremap(asls, OPREGION_SIZE);

	if (!base)

drivers/gpu/drm/i915/intel_panel.c

+80 −1
Original line number Diff line number Diff line
@@ -352,6 +352,14 @@ static u32 intel_panel_compute_brightness(struct intel_connector *connector, 
	return val;

}



static u32 bdw_get_backlight(struct intel_connector *connector)

{

	struct drm_device *dev = connector->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;



	return I915_READ(BLC_PWM_PCH_CTL2) & BACKLIGHT_DUTY_CYCLE_MASK;

}



static u32 pch_get_backlight(struct intel_connector *connector)

{

	struct drm_device *dev = connector->base.dev;
@@ -414,6 +422,14 @@ static u32 intel_panel_get_backlight(struct intel_connector *connector) 
	return val;

}



static void bdw_set_backlight(struct intel_connector *connector, u32 level)

{

	struct drm_device *dev = connector->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	u32 val = I915_READ(BLC_PWM_PCH_CTL2) & ~BACKLIGHT_DUTY_CYCLE_MASK;

	I915_WRITE(BLC_PWM_PCH_CTL2, val | level);

}



static void pch_set_backlight(struct intel_connector *connector, u32 level)

{

	struct drm_device *dev = connector->base.dev;
@@ -585,6 +601,38 @@ void intel_panel_disable_backlight(struct intel_connector *connector) 
	spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);

}



static void bdw_enable_backlight(struct intel_connector *connector)

{

	struct drm_device *dev = connector->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_panel *panel = &connector->panel;

	u32 pch_ctl1, pch_ctl2;



	pch_ctl1 = I915_READ(BLC_PWM_PCH_CTL1);

	if (pch_ctl1 & BLM_PCH_PWM_ENABLE) {

		DRM_DEBUG_KMS("pch backlight already enabled\n");

		pch_ctl1 &= ~BLM_PCH_PWM_ENABLE;

		I915_WRITE(BLC_PWM_PCH_CTL1, pch_ctl1);

	}



	pch_ctl2 = panel->backlight.max << 16;

	I915_WRITE(BLC_PWM_PCH_CTL2, pch_ctl2);



	pch_ctl1 = 0;

	if (panel->backlight.active_low_pwm)

		pch_ctl1 |= BLM_PCH_POLARITY;



	/* BDW always uses the pch pwm controls. */

	pch_ctl1 |= BLM_PCH_OVERRIDE_ENABLE;



	I915_WRITE(BLC_PWM_PCH_CTL1, pch_ctl1);

	POSTING_READ(BLC_PWM_PCH_CTL1);

	I915_WRITE(BLC_PWM_PCH_CTL1, pch_ctl1 | BLM_PCH_PWM_ENABLE);



	/* This won't stick until the above enable. */

	intel_panel_actually_set_backlight(connector, panel->backlight.level);

}



static void pch_enable_backlight(struct intel_connector *connector)

{

	struct drm_device *dev = connector->base.dev;
@@ -626,6 +674,7 @@ static void pch_enable_backlight(struct intel_connector *connector) 
	pch_ctl1 = 0;

	if (panel->backlight.active_low_pwm)

		pch_ctl1 |= BLM_PCH_POLARITY;



	I915_WRITE(BLC_PWM_PCH_CTL1, pch_ctl1);

	POSTING_READ(BLC_PWM_PCH_CTL1);

	I915_WRITE(BLC_PWM_PCH_CTL1, pch_ctl1 | BLM_PCH_PWM_ENABLE);
@@ -869,6 +918,30 @@ static void intel_backlight_device_unregister(struct intel_connector *connector) 
 * XXX: Query mode clock or hardware clock and program PWM modulation frequency

 * appropriately when it's 0. Use VBT and/or sane defaults.

 */

static int bdw_setup_backlight(struct intel_connector *connector)

{

	struct drm_device *dev = connector->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_panel *panel = &connector->panel;

	u32 pch_ctl1, pch_ctl2, val;



	pch_ctl1 = I915_READ(BLC_PWM_PCH_CTL1);

	panel->backlight.active_low_pwm = pch_ctl1 & BLM_PCH_POLARITY;



	pch_ctl2 = I915_READ(BLC_PWM_PCH_CTL2);

	panel->backlight.max = pch_ctl2 >> 16;

	if (!panel->backlight.max)

		return -ENODEV;



	val = bdw_get_backlight(connector);

	panel->backlight.level = intel_panel_compute_brightness(connector, val);



	panel->backlight.enabled = (pch_ctl1 & BLM_PCH_PWM_ENABLE) &&

		panel->backlight.level != 0;



	return 0;

}



static int pch_setup_backlight(struct intel_connector *connector)

{

	struct drm_device *dev = connector->base.dev;
@@ -1036,7 +1109,13 @@ void intel_panel_init_backlight_funcs(struct drm_device *dev) 
{

	struct drm_i915_private *dev_priv = dev->dev_private;



	if (HAS_PCH_SPLIT(dev)) {

	if (IS_BROADWELL(dev)) {

		dev_priv->display.setup_backlight = bdw_setup_backlight;

		dev_priv->display.enable_backlight = bdw_enable_backlight;

		dev_priv->display.disable_backlight = pch_disable_backlight;

		dev_priv->display.set_backlight = bdw_set_backlight;

		dev_priv->display.get_backlight = bdw_get_backlight;

	} else if (HAS_PCH_SPLIT(dev)) {

		dev_priv->display.setup_backlight = pch_setup_backlight;

		dev_priv->display.enable_backlight = pch_enable_backlight;

		dev_priv->display.disable_backlight = pch_disable_backlight;