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

Commit 764bc569 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (40 commits)
  drm/radeon/kms: i2c s/sprintf/snprintf/g for safety
  drm/radeon/kms: fix i2c pad masks on rs4xx
  drm/ttm: Fix up a theoretical deadlock
  drm/radeon/kms: fix tiling info on evergreen
  drm/radeon/kms: fix alignment when allocating buffers
  drm/vmwgfx: Fix up an error path during bo creation
  drm/radeon/kms: register an i2c adapter name for the dp aux bus
  drm/radeon/kms/atom: add proper external encoders support
  drm/radeon/kms/atom: cleanup and unify DVO handling
  drm/radeon/kms: properly power up/down the eDP panel as needed (v4)
  drm/radeon/kms/atom: set sane defaults in atombios_get_encoder_mode()
  drm/radeon/kms: turn the backlight off explicitly for dpms
  drm/radeon/kms: fix typo in r600 cs checker
  drm: radeon: fix error value sign
  drm/radeon/kms: fix and unify tiled buffer alignment checking for r6xx/7xx
  nouveau: Acknowledge HPD irq in handler, not bottom half
  drm/nouveau: Fix a few confusions between "chipset" and "card_type".
  drm/nouveau: don't expose backlight control when available through ACPI
  drm/nouveau/pm: improve memtiming mappings
  drm/nouveau: Make PCIE GART size depend on the available RAMIN space.
  ...
parents 589136bf 164bcb94

drivers/gpu/drm/nouveau/nouveau_backlight.c

+9 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
 */



#include <linux/backlight.h>

#include <linux/acpi.h>



#include "drmP.h"

#include "nouveau_drv.h"
@@ -136,6 +137,14 @@ int nouveau_backlight_init(struct drm_device *dev) 
{

	struct drm_nouveau_private *dev_priv = dev->dev_private;



#ifdef CONFIG_ACPI

	if (acpi_video_backlight_support()) {

		NV_INFO(dev, "ACPI backlight interface available, "

			     "not registering our own\n");

		return 0;

	}

#endif



	switch (dev_priv->card_type) {

	case NV_40:

		return nouveau_nv40_backlight_init(dev);

drivers/gpu/drm/nouveau/nouveau_bios.c

+1 −1
Original line number Diff line number Diff line
@@ -6829,7 +6829,7 @@ nouveau_bios_posted(struct drm_device *dev) 
	struct drm_nouveau_private *dev_priv = dev->dev_private;

	unsigned htotal;



	if (dev_priv->chipset >= NV_50) {

	if (dev_priv->card_type >= NV_50) {

		if (NVReadVgaCrtc(dev, 0, 0x00) == 0 &&

		    NVReadVgaCrtc(dev, 0, 0x1a) == 0)

			return false;

drivers/gpu/drm/nouveau/nouveau_bo.c

+38 −5
Original line number Diff line number Diff line
@@ -143,8 +143,10 @@ nouveau_bo_new(struct drm_device *dev, struct nouveau_channel *chan, 
	nvbo->no_vm = no_vm;

	nvbo->tile_mode = tile_mode;

	nvbo->tile_flags = tile_flags;

	nvbo->bo.bdev = &dev_priv->ttm.bdev;



	nouveau_bo_fixup_align(dev, tile_mode, tile_flags, &align, &size);

	nouveau_bo_fixup_align(dev, tile_mode, nouveau_bo_tile_layout(nvbo),

			       &align, &size);

	align >>= PAGE_SHIFT;



	nouveau_bo_placement_set(nvbo, flags, 0);
@@ -176,6 +178,31 @@ set_placement_list(uint32_t *pl, unsigned *n, uint32_t type, uint32_t flags) 
		pl[(*n)++] = TTM_PL_FLAG_SYSTEM | flags;

}



static void

set_placement_range(struct nouveau_bo *nvbo, uint32_t type)

{

	struct drm_nouveau_private *dev_priv = nouveau_bdev(nvbo->bo.bdev);



	if (dev_priv->card_type == NV_10 &&

	    nvbo->tile_mode && (type & TTM_PL_FLAG_VRAM)) {

		/*

		 * Make sure that the color and depth buffers are handled

		 * by independent memory controller units. Up to a 9x

		 * speed up when alpha-blending and depth-test are enabled

		 * at the same time.

		 */

		int vram_pages = dev_priv->vram_size >> PAGE_SHIFT;



		if (nvbo->tile_flags & NOUVEAU_GEM_TILE_ZETA) {

			nvbo->placement.fpfn = vram_pages / 2;

			nvbo->placement.lpfn = ~0;

		} else {

			nvbo->placement.fpfn = 0;

			nvbo->placement.lpfn = vram_pages / 2;

		}

	}

}



void

nouveau_bo_placement_set(struct nouveau_bo *nvbo, uint32_t type, uint32_t busy)

{
@@ -190,6 +217,8 @@ nouveau_bo_placement_set(struct nouveau_bo *nvbo, uint32_t type, uint32_t busy) 
	pl->busy_placement = nvbo->busy_placements;

	set_placement_list(nvbo->busy_placements, &pl->num_busy_placement,

			   type | busy, flags);



	set_placement_range(nvbo, type);

}



int
@@ -525,7 +554,8 @@ nv50_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo, 
		stride  = 16 * 4;

		height  = amount / stride;



		if (new_mem->mem_type == TTM_PL_VRAM && nvbo->tile_flags) {

		if (new_mem->mem_type == TTM_PL_VRAM &&

		    nouveau_bo_tile_layout(nvbo)) {

			ret = RING_SPACE(chan, 8);

			if (ret)

				return ret;
@@ -546,7 +576,8 @@ nv50_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo, 
			BEGIN_RING(chan, NvSubM2MF, 0x0200, 1);

			OUT_RING  (chan, 1);

		}

		if (old_mem->mem_type == TTM_PL_VRAM && nvbo->tile_flags) {

		if (old_mem->mem_type == TTM_PL_VRAM &&

		    nouveau_bo_tile_layout(nvbo)) {

			ret = RING_SPACE(chan, 8);

			if (ret)

				return ret;
@@ -753,7 +784,8 @@ nouveau_bo_vm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *new_mem, 
	if (dev_priv->card_type == NV_50) {

		ret = nv50_mem_vm_bind_linear(dev,

					      offset + dev_priv->vm_vram_base,

					      new_mem->size, nvbo->tile_flags,

					      new_mem->size,

					      nouveau_bo_tile_layout(nvbo),

					      offset);

		if (ret)

			return ret;
@@ -894,7 +926,8 @@ nouveau_ttm_fault_reserve_notify(struct ttm_buffer_object *bo) 
	 * nothing to do here.

	 */

	if (bo->mem.mem_type != TTM_PL_VRAM) {

		if (dev_priv->card_type < NV_50 || !nvbo->tile_flags)

		if (dev_priv->card_type < NV_50 ||

		    !nouveau_bo_tile_layout(nvbo))

			return 0;

	}

drivers/gpu/drm/nouveau/nouveau_connector.c

+30 −47
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ 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) {

		struct drm_encoder *encoder = to_drm_encoder(nv_encoder);

		struct drm_encoder_helper_funcs *helper =

						encoder->helper_private;
@@ -641,11 +641,28 @@ nouveau_connector_get_modes(struct drm_connector *connector) 
	return ret;

}



static unsigned

get_tmds_link_bandwidth(struct drm_connector *connector)

{

	struct nouveau_connector *nv_connector = nouveau_connector(connector);

	struct drm_nouveau_private *dev_priv = connector->dev->dev_private;

	struct dcb_entry *dcb = nv_connector->detected_encoder->dcb;



	if (dcb->location != DCB_LOC_ON_CHIP ||

	    dev_priv->chipset >= 0x46)

		return 165000;

	else if (dev_priv->chipset >= 0x40)

		return 155000;

	else if (dev_priv->chipset >= 0x18)

		return 135000;

	else

		return 112000;

}



static int

nouveau_connector_mode_valid(struct drm_connector *connector,

			     struct drm_display_mode *mode)

{

	struct drm_nouveau_private *dev_priv = connector->dev->dev_private;

	struct nouveau_connector *nv_connector = nouveau_connector(connector);

	struct nouveau_encoder *nv_encoder = nv_connector->detected_encoder;

	struct drm_encoder *encoder = to_drm_encoder(nv_encoder);
@@ -663,11 +680,9 @@ nouveau_connector_mode_valid(struct drm_connector *connector, 
		max_clock = 400000;

		break;

	case OUTPUT_TMDS:

		if ((dev_priv->card_type >= NV_50 && !nouveau_duallink) ||

		    !nv_encoder->dcb->duallink_possible)

			max_clock = 165000;

		else

			max_clock = 330000;

		max_clock = get_tmds_link_bandwidth(connector);

		if (nouveau_duallink && nv_encoder->dcb->duallink_possible)

			max_clock *= 2;

		break;

	case OUTPUT_ANALOG:

		max_clock = nv_encoder->dcb->crtconf.maxfreq;
@@ -709,44 +724,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,
@@ -872,6 +849,7 @@ nouveau_connector_create(struct drm_device *dev, int index) 
					dev->mode_config.scaling_mode_property,

					nv_connector->scaling_mode);

		}

		connector->polled = DRM_CONNECTOR_POLL_CONNECT;

		/* fall-through */

	case DCB_CONNECTOR_TV_0:

	case DCB_CONNECTOR_TV_1:
@@ -888,11 +866,16 @@ 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 (dcb->type != DCB_CONNECTOR_LVDS) {

			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 *);