Merge branch 'drm-next' of ../drm-2.6 into drm-next (273fad2b) · Commits · e / devices / android_kernel_teracube_emerald

drivers/gpu/drm/drm_fb_helper.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -707,7 +707,7 @@ int drm_fb_helper_set_par(struct fb_info *info)

		if (crtc->fb == fb_helper->crtc_info[i].mode_set.fb) {
		mutex_lock(&dev->mode_config.mutex);
		ret = crtc->funcs->set_config(&fb_helper->crtc_info->mode_set);
		ret = crtc->funcs->set_config(&fb_helper->crtc_info[i].mode_set);
		mutex_unlock(&dev->mode_config.mutex);
		if (ret)
		return ret;

drivers/gpu/drm/radeon/atombios_crtc.c

+20 −11

Original line number	Diff line number	Diff line
		@@ -368,8 +368,9 @@ static void atombios_set_ss(struct drm_crtc *crtc, int enable)
		list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
		if (encoder->crtc == crtc) {
		radeon_encoder = to_radeon_encoder(encoder);
		dig = radeon_encoder->enc_priv;
		/* only enable spread spectrum on LVDS */
		if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
		dig = radeon_encoder->enc_priv;
		if (dig && dig->ss) {
		percentage = dig->ss->percentage;
		type = dig->ss->type;
		@@ -378,6 +379,8 @@ static void atombios_set_ss(struct drm_crtc *crtc, int enable)
		range = dig->ss->range;
		} else if (enable)
		return;
		} else if (enable)
		return;
		break;
		}
		}
		@@ -387,7 +390,7 @@ static void atombios_set_ss(struct drm_crtc *crtc, int enable)

		if (ASIC_IS_AVIVO(rdev)) {
		memset(&args, 0, sizeof(args));
		args.usSpreadSpectrumPercentage = percentage;
		args.usSpreadSpectrumPercentage = cpu_to_le16(percentage);
		args.ucSpreadSpectrumType = type;
		args.ucSpreadSpectrumStep = step;
		args.ucSpreadSpectrumDelay = delay;
		@@ -397,7 +400,7 @@ static void atombios_set_ss(struct drm_crtc *crtc, int enable)
		atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
		} else {
		memset(&legacy_args, 0, sizeof(legacy_args));
		legacy_args.usSpreadSpectrumPercentage = percentage;
		legacy_args.usSpreadSpectrumPercentage = cpu_to_le16(percentage);
		legacy_args.ucSpreadSpectrumType = type;
		legacy_args.ucSpreadSpectrumStepSize_Delay = (step & 3) << 2;
		legacy_args.ucSpreadSpectrumStepSize_Delay \|= (delay & 7) << 4;
		@@ -483,8 +486,14 @@ void atombios_crtc_set_pll(struct drm_crtc crtc, struct drm_display_mode mode)
		atom_execute_table(rdev->mode_info.atom_context,
		index, (uint32_t *)&adjust_pll_args);
		adjusted_clock = le16_to_cpu(adjust_pll_args.usPixelClock) * 10;
		} else
		} else {
		/* DVO wants 2x pixel clock if the DVO chip is in 12 bit mode */
		if (ASIC_IS_AVIVO(rdev) &&
		(radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1))
		adjusted_clock = mode->clock * 2;
		else
		adjusted_clock = mode->clock;
		}

		if (radeon_crtc->crtc_id == 0)
		pll = &rdev->clock.p1pll;

drivers/gpu/drm/radeon/radeon_atombios.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -655,6 +655,16 @@ bool radeon_atom_get_clock_info(struct drm_device *dev)
		p1pll->pll_out_min = 64800;
		else
		p1pll->pll_out_min = 20000;
		} else if (p1pll->pll_out_min > 64800) {
		/* Limiting the pll output range is a good thing generally as
		* it limits the number of possible pll combinations for a given
		* frequency presumably to the ones that work best on each card.
		* However, certain duallink DVI monitors seem to like
		* pll combinations that would be limited by this at least on
		* pre-DCE 3.0 r6xx hardware. This might need to be adjusted per
		* family.
		*/
		p1pll->pll_out_min = 64800;
		}

		p1pll->pll_in_min =

drivers/gpu/drm/radeon/radeon_combios.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -1587,6 +1587,12 @@ static bool radeon_apply_legacy_tv_quirks(struct drm_device *dev)
		dev->pdev->subsystem_device == 0x009f)
		return false;

		/* HP dc5750 has non-existent TV port */
		if (dev->pdev->device == 0x5974 &&
		dev->pdev->subsystem_vendor == 0x103c &&
		dev->pdev->subsystem_device == 0x280a)
		return false;

		return true;
		}

drivers/gpu/drm/radeon/radeon_device.c

+17 −12

Original line number	Diff line number	Diff line
		@@ -443,20 +443,24 @@ static uint32_t cail_reg_read(struct card_info *info, uint32_t reg)
		return r;
		}

		static struct card_info atom_card_info = {
		.dev = NULL,
		.reg_read = cail_reg_read,
		.reg_write = cail_reg_write,
		.mc_read = cail_mc_read,
		.mc_write = cail_mc_write,
		.pll_read = cail_pll_read,
		.pll_write = cail_pll_write,
		};

		int radeon_atombios_init(struct radeon_device *rdev)
		{
		atom_card_info.dev = rdev->ddev;
		rdev->mode_info.atom_context = atom_parse(&atom_card_info, rdev->bios);
		struct card_info *atom_card_info =
		kzalloc(sizeof(struct card_info), GFP_KERNEL);

		if (!atom_card_info)
		return -ENOMEM;

		rdev->mode_info.atom_card_info = atom_card_info;
		atom_card_info->dev = rdev->ddev;
		atom_card_info->reg_read = cail_reg_read;
		atom_card_info->reg_write = cail_reg_write;
		atom_card_info->mc_read = cail_mc_read;
		atom_card_info->mc_write = cail_mc_write;
		atom_card_info->pll_read = cail_pll_read;
		atom_card_info->pll_write = cail_pll_write;

		rdev->mode_info.atom_context = atom_parse(atom_card_info, rdev->bios);
		radeon_atom_initialize_bios_scratch_regs(rdev->ddev);
		return 0;
		}
		@@ -464,6 +468,7 @@ int radeon_atombios_init(struct radeon_device *rdev)
		void radeon_atombios_fini(struct radeon_device *rdev)
		{
		kfree(rdev->mode_info.atom_context);
		kfree(rdev->mode_info.atom_card_info);
		}

		int radeon_combios_init(struct radeon_device *rdev)