Merge tag 'drm-intel-next-2013-05-20-merged' of...

    <sect2>

      <title>KMS API Functions</title>

!Edrivers/gpu/drm/drm_crtc.c

!Edrivers/gpu/drm/drm_rect.c

!Finclude/drm/drm_rect.h

    </sect2>

  </sect1>

		drm_platform.o drm_sysfs.o drm_hashtab.o drm_mm.o \

		drm_crtc.o drm_modes.o drm_edid.o \

		drm_info.o drm_debugfs.o drm_encoder_slave.o \

		drm_trace_points.o drm_global.o drm_prime.o

		drm_trace_points.o drm_global.o drm_prime.o \

		drm_rect.o

drm-$(CONFIG_COMPAT) += drm_ioc32.o

drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o

/*

 * Copyright (C) 2011-2013 Intel Corporation

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice (including the next

 * paragraph) shall be included in all copies or substantial portions of the

 * Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */

#include <linux/errno.h>

#include <linux/export.h>

#include <linux/kernel.h>

#include <drm/drmP.h>

#include <drm/drm_rect.h>

/**

 * drm_rect_intersect - intersect two rectangles

 * @r1: first rectangle

 * @r2: second rectangle

 *

 * Calculate the intersection of rectangles @r1 and @r2.

 * @r1 will be overwritten with the intersection.

 *

 * RETURNS:

 * %true if rectangle @r1 is still visible after the operation,

 * %false otherwise.

 */

bool drm_rect_intersect(struct drm_rect *r1, const struct drm_rect *r2)

{

	r1->x1 = max(r1->x1, r2->x1);

	r1->y1 = max(r1->y1, r2->y1);

	r1->x2 = min(r1->x2, r2->x2);

	r1->y2 = min(r1->y2, r2->y2);

	return drm_rect_visible(r1);

}

EXPORT_SYMBOL(drm_rect_intersect);

/**

 * drm_rect_clip_scaled - perform a scaled clip operation

 * @src: source window rectangle

 * @dst: destination window rectangle

 * @clip: clip rectangle

 * @hscale: horizontal scaling factor

 * @vscale: vertical scaling factor

 *

 * Clip rectangle @dst by rectangle @clip. Clip rectangle @src by the

 * same amounts multiplied by @hscale and @vscale.

 *

 * RETURNS:

 * %true if rectangle @dst is still visible after being clipped,

 * %false otherwise

 */

bool drm_rect_clip_scaled(struct drm_rect *src, struct drm_rect *dst,

			  const struct drm_rect *clip,

			  int hscale, int vscale)

{

	int diff;

	diff = clip->x1 - dst->x1;

	if (diff > 0) {

		int64_t tmp = src->x1 + (int64_t) diff * hscale;

		src->x1 = clamp_t(int64_t, tmp, INT_MIN, INT_MAX);

	}

	diff = clip->y1 - dst->y1;

	if (diff > 0) {

		int64_t tmp = src->y1 + (int64_t) diff * vscale;

		src->y1 = clamp_t(int64_t, tmp, INT_MIN, INT_MAX);

	}

	diff = dst->x2 - clip->x2;

	if (diff > 0) {

		int64_t tmp = src->x2 - (int64_t) diff * hscale;

		src->x2 = clamp_t(int64_t, tmp, INT_MIN, INT_MAX);

	}

	diff = dst->y2 - clip->y2;

	if (diff > 0) {

		int64_t tmp = src->y2 - (int64_t) diff * vscale;

		src->y2 = clamp_t(int64_t, tmp, INT_MIN, INT_MAX);

	}

	return drm_rect_intersect(dst, clip);

}

EXPORT_SYMBOL(drm_rect_clip_scaled);

static int drm_calc_scale(int src, int dst)

{

	int scale = 0;

	if (src < 0 || dst < 0)

		return -EINVAL;

	if (dst == 0)

		return 0;

	scale = src / dst;

	return scale;

}

/**

 * drm_rect_calc_hscale - calculate the horizontal scaling factor

 * @src: source window rectangle

 * @dst: destination window rectangle

 * @min_hscale: minimum allowed horizontal scaling factor

 * @max_hscale: maximum allowed horizontal scaling factor

 *

 * Calculate the horizontal scaling factor as

 * (@src width) / (@dst width).

 *

 * RETURNS:

 * The horizontal scaling factor, or errno of out of limits.

 */

int drm_rect_calc_hscale(const struct drm_rect *src,

			 const struct drm_rect *dst,

			 int min_hscale, int max_hscale)

{

	int src_w = drm_rect_width(src);

	int dst_w = drm_rect_width(dst);

	int hscale = drm_calc_scale(src_w, dst_w);

	if (hscale < 0 || dst_w == 0)

		return hscale;

	if (hscale < min_hscale || hscale > max_hscale)

		return -ERANGE;

	return hscale;

}

EXPORT_SYMBOL(drm_rect_calc_hscale);

/**

 * drm_rect_calc_vscale - calculate the vertical scaling factor

 * @src: source window rectangle

 * @dst: destination window rectangle

 * @min_vscale: minimum allowed vertical scaling factor

 * @max_vscale: maximum allowed vertical scaling factor

 *

 * Calculate the vertical scaling factor as

 * (@src height) / (@dst height).

 *

 * RETURNS:

 * The vertical scaling factor, or errno of out of limits.

 */

int drm_rect_calc_vscale(const struct drm_rect *src,

			 const struct drm_rect *dst,

			 int min_vscale, int max_vscale)

{

	int src_h = drm_rect_height(src);

	int dst_h = drm_rect_height(dst);

	int vscale = drm_calc_scale(src_h, dst_h);

	if (vscale < 0 || dst_h == 0)

		return vscale;

	if (vscale < min_vscale || vscale > max_vscale)

		return -ERANGE;

	return vscale;

}

EXPORT_SYMBOL(drm_rect_calc_vscale);

/**

 * drm_calc_hscale_relaxed - calculate the horizontal scaling factor

 * @src: source window rectangle

 * @dst: destination window rectangle

 * @min_hscale: minimum allowed horizontal scaling factor

 * @max_hscale: maximum allowed horizontal scaling factor

 *

 * Calculate the horizontal scaling factor as

 * (@src width) / (@dst width).

 *

 * If the calculated scaling factor is below @min_vscale,

 * decrease the height of rectangle @dst to compensate.

 *

 * If the calculated scaling factor is above @max_vscale,

 * decrease the height of rectangle @src to compensate.

 *

 * RETURNS:

 * The horizontal scaling factor.

 */

int drm_rect_calc_hscale_relaxed(struct drm_rect *src,

				 struct drm_rect *dst,

				 int min_hscale, int max_hscale)

{

	int src_w = drm_rect_width(src);

	int dst_w = drm_rect_width(dst);

	int hscale = drm_calc_scale(src_w, dst_w);

	if (hscale < 0 || dst_w == 0)

		return hscale;

	if (hscale < min_hscale) {

		int max_dst_w = src_w / min_hscale;

		drm_rect_adjust_size(dst, max_dst_w - dst_w, 0);

		return min_hscale;

	}

	if (hscale > max_hscale) {

		int max_src_w = dst_w * max_hscale;

		drm_rect_adjust_size(src, max_src_w - src_w, 0);

		return max_hscale;

	}

	return hscale;

}

EXPORT_SYMBOL(drm_rect_calc_hscale_relaxed);

/**

 * drm_rect_calc_vscale_relaxed - calculate the vertical scaling factor

 * @src: source window rectangle

 * @dst: destination window rectangle

 * @min_vscale: minimum allowed vertical scaling factor

 * @max_vscale: maximum allowed vertical scaling factor

 *

 * Calculate the vertical scaling factor as

 * (@src height) / (@dst height).

 *

 * If the calculated scaling factor is below @min_vscale,

 * decrease the height of rectangle @dst to compensate.

 *

 * If the calculated scaling factor is above @max_vscale,

 * decrease the height of rectangle @src to compensate.

 *

 * RETURNS:

 * The vertical scaling factor.

 */

int drm_rect_calc_vscale_relaxed(struct drm_rect *src,

				 struct drm_rect *dst,

				 int min_vscale, int max_vscale)

{

	int src_h = drm_rect_height(src);

	int dst_h = drm_rect_height(dst);

	int vscale = drm_calc_scale(src_h, dst_h);

	if (vscale < 0 || dst_h == 0)

		return vscale;

	if (vscale < min_vscale) {

		int max_dst_h = src_h / min_vscale;

		drm_rect_adjust_size(dst, 0, max_dst_h - dst_h);

		return min_vscale;

	}

	if (vscale > max_vscale) {

		int max_src_h = dst_h * max_vscale;

		drm_rect_adjust_size(src, 0, max_src_h - src_h);

		return max_vscale;

	}

	return vscale;

}

EXPORT_SYMBOL(drm_rect_calc_vscale_relaxed);

/**

 * drm_rect_debug_print - print the rectangle information

 * @r: rectangle to print

 * @fixed_point: rectangle is in 16.16 fixed point format

 */

void drm_rect_debug_print(const struct drm_rect *r, bool fixed_point)

{

	int w = drm_rect_width(r);

	int h = drm_rect_height(r);

	if (fixed_point)

		DRM_DEBUG_KMS("%d.%06ux%d.%06u%+d.%06u%+d.%06u\n",

			      w >> 16, ((w & 0xffff) * 15625) >> 10,

			      h >> 16, ((h & 0xffff) * 15625) >> 10,

			      r->x1 >> 16, ((r->x1 & 0xffff) * 15625) >> 10,

			      r->y1 >> 16, ((r->y1 & 0xffff) * 15625) >> 10);

	else

		DRM_DEBUG_KMS("%dx%d%+d%+d\n", w, h, r->x1, r->y1);

}

EXPORT_SYMBOL(drm_rect_debug_print);

#define CH7xxx_REG_DID		0x4b

#define CH7011_VID		0x83 /* 7010 as well */

#define CH7010B_VID		0x05

#define CH7009A_VID		0x84

#define CH7009B_VID		0x85

#define CH7301_VID		0x95

#define CH7xxx_VID		0x84

#define CH7xxx_DID		0x17

#define CH7010_DID		0x16

#define CH7xxx_NUM_REGS		0x4c

	char *name;

} ch7xxx_ids[] = {

	{ CH7011_VID, "CH7011" },

	{ CH7010B_VID, "CH7010B" },

	{ CH7009A_VID, "CH7009A" },

	{ CH7009B_VID, "CH7009B" },

	{ CH7301_VID, "CH7301" },

};

static struct ch7xxx_did_struct {

	uint8_t did;

	char *name;

} ch7xxx_dids[] = {

	{ CH7xxx_DID, "CH7XXX" },

	{ CH7010_DID, "CH7010B" },

};

struct ch7xxx_priv {

	bool quiet;

};

	return NULL;

}

static char *ch7xxx_get_did(uint8_t did)

{

	int i;

	for (i = 0; i < ARRAY_SIZE(ch7xxx_dids); i++) {

		if (ch7xxx_dids[i].did == did)

			return ch7xxx_dids[i].name;

	}

	return NULL;

}

/** Reads an 8 bit register */

static bool ch7xxx_readb(struct intel_dvo_device *dvo, int addr, uint8_t *ch)

{

	/* this will detect the CH7xxx chip on the specified i2c bus */

	struct ch7xxx_priv *ch7xxx;

	uint8_t vendor, device;

	char *name;

	char *name, *devid;

	ch7xxx = kzalloc(sizeof(struct ch7xxx_priv), GFP_KERNEL);

	if (ch7xxx == NULL)

	if (!ch7xxx_readb(dvo, CH7xxx_REG_DID, &device))

		goto out;

	if (device != CH7xxx_DID) {

	devid = ch7xxx_get_did(device);

	if (!devid) {

		DRM_DEBUG_KMS("ch7xxx not detected; got 0x%02x from %s "

				"slave %d.\n",

			  vendor, adapter->name, dvo->slave_addr);

	seq_printf(m, "gen: %d\n", info->gen);

	seq_printf(m, "pch: %d\n", INTEL_PCH_TYPE(dev));

#define DEV_INFO_FLAG(x) seq_printf(m, #x ": %s\n", yesno(info->x))

#define DEV_INFO_SEP ;

	DEV_INFO_FLAGS;

#undef DEV_INFO_FLAG

#undef DEV_INFO_SEP

#define PRINT_FLAG(x)  seq_printf(m, #x ": %s\n", yesno(info->x))

#define SEP_SEMICOLON ;

	DEV_INFO_FOR_EACH_FLAG(PRINT_FLAG, SEP_SEMICOLON);

#undef PRINT_FLAG

#undef SEP_SEMICOLON

	return 0;

}

			   MEMSTAT_VID_SHIFT);

		seq_printf(m, "Current P-state: %d\n",

			   (rgvstat & MEMSTAT_PSTATE_MASK) >> MEMSTAT_PSTATE_SHIFT);

	} else if (IS_GEN6(dev) || IS_GEN7(dev)) {

	} else if ((IS_GEN6(dev) || IS_GEN7(dev)) && !IS_VALLEYVIEW(dev)) {

		u32 gt_perf_status = I915_READ(GEN6_GT_PERF_STATUS);

		u32 rp_state_limits = I915_READ(GEN6_RP_STATE_LIMITS);

		u32 rp_state_cap = I915_READ(GEN6_RP_STATE_CAP);

		seq_printf(m, "Max overclocked frequency: %dMHz\n",

			   dev_priv->rps.hw_max * GT_FREQUENCY_MULTIPLIER);

	} else if (IS_VALLEYVIEW(dev)) {

		u32 freq_sts, val;

		mutex_lock(&dev_priv->rps.hw_lock);

		valleyview_punit_read(dev_priv, PUNIT_REG_GPU_FREQ_STS,

				      &freq_sts);

		seq_printf(m, "PUNIT_REG_GPU_FREQ_STS: 0x%08x\n", freq_sts);

		seq_printf(m, "DDR freq: %d MHz\n", dev_priv->mem_freq);

		valleyview_punit_read(dev_priv, PUNIT_FUSE_BUS1, &val);

		seq_printf(m, "max GPU freq: %d MHz\n",

			   vlv_gpu_freq(dev_priv->mem_freq, val));

		valleyview_punit_read(dev_priv, PUNIT_REG_GPU_LFM, &val);

		seq_printf(m, "min GPU freq: %d MHz\n",

			   vlv_gpu_freq(dev_priv->mem_freq, val));

		seq_printf(m, "current GPU freq: %d MHz\n",

			   vlv_gpu_freq(dev_priv->mem_freq,

					(freq_sts >> 8) & 0xff));

		mutex_unlock(&dev_priv->rps.hw_lock);

	} else {

		seq_printf(m, "no P-state info available\n");

	}

	if (ret)

		return ret;

	if (IS_VALLEYVIEW(dev))

		*val = vlv_gpu_freq(dev_priv->mem_freq,

				    dev_priv->rps.max_delay);

	else

		*val = dev_priv->rps.max_delay * GT_FREQUENCY_MULTIPLIER;

	mutex_unlock(&dev_priv->rps.hw_lock);

	/*

	 * Turbo will still be enabled, but won't go above the set value.

	 */

	if (IS_VALLEYVIEW(dev)) {

		val = vlv_freq_opcode(dev_priv->mem_freq, val);

		dev_priv->rps.max_delay = val;

		gen6_set_rps(dev, val);

	} else {

		do_div(val, GT_FREQUENCY_MULTIPLIER);

		dev_priv->rps.max_delay = val;

		gen6_set_rps(dev, val);

	}

	mutex_unlock(&dev_priv->rps.hw_lock);

	return 0;

	if (ret)

		return ret;

	if (IS_VALLEYVIEW(dev))

		*val = vlv_gpu_freq(dev_priv->mem_freq,

				    dev_priv->rps.min_delay);

	else

		*val = dev_priv->rps.min_delay * GT_FREQUENCY_MULTIPLIER;

	mutex_unlock(&dev_priv->rps.hw_lock);

	/*

	 * Turbo will still be enabled, but won't go below the set value.

	 */

	if (IS_VALLEYVIEW(dev)) {

		val = vlv_freq_opcode(dev_priv->mem_freq, val);

		dev_priv->rps.min_delay = val;

		valleyview_set_rps(dev, val);

	} else {

		do_div(val, GT_FREQUENCY_MULTIPLIER);

		dev_priv->rps.min_delay = val;

		gen6_set_rps(dev, val);

	}

	mutex_unlock(&dev_priv->rps.hw_lock);

	return 0;