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

Commit 9ce92907 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: Fix oops after radeon_cs_parser_init() failure.
  drm/radeon/kms: move radeon KMS on/off switch out of staging.
  drm/radeon/kms: Bailout of blit if error happen & protect with mutex V3
  drm/vmwgfx: Don't send bad flags to the host
  drm/vmwgfx: Request SVGA version 2 and bail if not found
  drm/vmwgfx: Correctly detect 3D
  drm/ttm: remove unnecessary save_flags and ttm_flag_masked in ttm_bo_util.c
  drm/kms: Remove incorrect comment in struct drm_mode_modeinfo
  drm/ttm: remove padding from ttm_ref_object on 64bit builds
  drm/radeon/kms: release agp on error.
  drm/kms/radeon/agp: Move the check of the aper_size after drm_acp_acquire and drm_agp_info
  drm/kms/radeon/agp: Fix warning, format ‘%d’ expects type ‘int’, but argument 4 has type ‘size_t’
  drm/ttm: Avoid conflicting reserve_memtype during ttm_tt_set_page_caching.
  drm/kms/radeon: pick digitial encoders smarter. (v3)
  drm/radeon/kms: use active device to pick connector for encoder
  drm/radeon/kms: fix incorrect logic in DP vs eDP connector checking.
parents 13af7574 17aafcca

drivers/gpu/drm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ config DRM_RADEON 


	  If M is selected, the module will be called radeon.



source "drivers/gpu/drm/radeon/Kconfig"



config DRM_I810

	tristate "Intel I810"

	depends on DRM && AGP && AGP_INTEL

drivers/gpu/drm/radeon/atombios_dp.c

+10 −17
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ void radeon_dp_set_link_config(struct drm_connector *connector, 
	struct radeon_connector *radeon_connector;

	struct radeon_connector_atom_dig *dig_connector;



	if ((connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) ||

	if ((connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) &&

	    (connector->connector_type != DRM_MODE_CONNECTOR_eDP))

		return;
@@ -583,7 +583,7 @@ void dp_link_train(struct drm_encoder *encoder, 
	u8 train_set[4];

	int i;



	if ((connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) ||

	if ((connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) &&

	    (connector->connector_type != DRM_MODE_CONNECTOR_eDP))

		return;
@@ -596,8 +596,7 @@ void dp_link_train(struct drm_encoder *encoder, 
		return;

	dig_connector = radeon_connector->con_priv;



	if (ASIC_IS_DCE32(rdev)) {

		if (dig->dig_block)

	if (dig->dig_encoder)

		enc_id |= ATOM_DP_CONFIG_DIG2_ENCODER;

	else

		enc_id |= ATOM_DP_CONFIG_DIG1_ENCODER;
@@ -605,12 +604,6 @@ void dp_link_train(struct drm_encoder *encoder, 
		enc_id |= ATOM_DP_CONFIG_LINK_B;

	else

		enc_id |= ATOM_DP_CONFIG_LINK_A;

	} else {

		if (dig_connector->linkb)

			enc_id |= ATOM_DP_CONFIG_DIG2_ENCODER | ATOM_DP_CONFIG_LINK_B;

		else

			enc_id |= ATOM_DP_CONFIG_DIG1_ENCODER | ATOM_DP_CONFIG_LINK_A;

	}



	memset(link_configuration, 0, DP_LINK_CONFIGURATION_SIZE);

	if (dig_connector->dp_clock == 270000)

drivers/gpu/drm/radeon/r600.c

+27 −27
Original line number Diff line number Diff line
@@ -1788,23 +1788,24 @@ void r600_fence_ring_emit(struct radeon_device *rdev, 
	radeon_ring_write(rdev, RB_INT_STAT);

}



int r600_copy_dma(struct radeon_device *rdev,

		  uint64_t src_offset,

		  uint64_t dst_offset,

		  unsigned num_pages,

		  struct radeon_fence *fence)

{

	/* FIXME: implement */

	return 0;

}



int r600_copy_blit(struct radeon_device *rdev,

		   uint64_t src_offset, uint64_t dst_offset,

		   unsigned num_pages, struct radeon_fence *fence)

{

	r600_blit_prepare_copy(rdev, num_pages * RADEON_GPU_PAGE_SIZE);

	int r;



	mutex_lock(&rdev->r600_blit.mutex);

	rdev->r600_blit.vb_ib = NULL;

	r = r600_blit_prepare_copy(rdev, num_pages * RADEON_GPU_PAGE_SIZE);

	if (r) {

		if (rdev->r600_blit.vb_ib)

			radeon_ib_free(rdev, &rdev->r600_blit.vb_ib);

		mutex_unlock(&rdev->r600_blit.mutex);

		return r;

	}

	r600_kms_blit_copy(rdev, src_offset, dst_offset, num_pages * RADEON_GPU_PAGE_SIZE);

	r600_blit_done_copy(rdev, fence);

	mutex_unlock(&rdev->r600_blit.mutex);

	return 0;

}
@@ -1860,15 +1861,8 @@ int r600_startup(struct radeon_device *rdev) 
			return r;

	}

	r600_gpu_init(rdev);



	if (!rdev->r600_blit.shader_obj) {

		r = r600_blit_init(rdev);

		if (r) {

			DRM_ERROR("radeon: failed blitter (%d).\n", r);

			return r;

		}

	}



	/* pin copy shader into vram */

	if (rdev->r600_blit.shader_obj) {

		r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);

		if (unlikely(r != 0))

			return r;
@@ -1879,7 +1873,7 @@ int r600_startup(struct radeon_device *rdev) 
			dev_err(rdev->dev, "(%d) pin blit object failed\n", r);

			return r;

		}



	}

	/* Enable IRQ */

	r = r600_irq_init(rdev);

	if (r) {
@@ -2051,6 +2045,12 @@ int r600_init(struct radeon_device *rdev) 
	r = r600_pcie_gart_init(rdev);

	if (r)

		return r;

	r = r600_blit_init(rdev);

	if (r) {

		r600_blit_fini(rdev);

		rdev->asic->copy = NULL;

		dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r);

	}



	rdev->accel_working = true;

	r = r600_startup(rdev);

drivers/gpu/drm/radeon/r600_blit_kms.c

+5 −2
Original line number Diff line number Diff line
@@ -449,6 +449,7 @@ int r600_blit_init(struct radeon_device *rdev) 
	u32 packet2s[16];

	int num_packet2s = 0;



	mutex_init(&rdev->r600_blit.mutex);

	rdev->r600_blit.state_offset = 0;



	if (rdev->family >= CHIP_RV770)
@@ -557,7 +558,8 @@ int r600_blit_prepare_copy(struct radeon_device *rdev, int size_bytes) 
	int dwords_per_loop = 76, num_loops;



	r = r600_vb_ib_get(rdev);

	WARN_ON(r);

	if (r)

		return r;



	/* set_render_target emits 2 extra dwords on rv6xx */

	if (rdev->family > CHIP_R600 && rdev->family < CHIP_RV770)
@@ -583,7 +585,8 @@ int r600_blit_prepare_copy(struct radeon_device *rdev, int size_bytes) 
	ring_size += 5; /* done copy */

	ring_size += 7; /* fence emit for done copy */

	r = radeon_ring_lock(rdev, ring_size);

	WARN_ON(r);

	if (r)

		return r;



	set_default_state(rdev); /* 14 */

	set_shaders(rdev); /* 26 */

drivers/gpu/drm/radeon/radeon.h

+1 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ struct r600_ih { 
};



struct r600_blit {

	struct mutex		mutex;

	struct radeon_bo	*shader_obj;

	u64 shader_gpu_addr;

	u32 vs_offset, ps_offset;