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

Commit 928352e9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Just two radeon and two intel fixes: endian and regression fixes"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: fix endian swapping in vbios fetch for tdp table
  drm/radeon: disable native backlight control on pre-r6xx asics (v2)
  drm/i915: Kick fbdev before vgacon
  drm/i915: drop WaSetupGtModeTdRowDispatch:snb
parents 9a7e4f56 a0fc6081

drivers/gpu/drm/i915/i915_dma.c

+6 −4
Original line number Diff line number Diff line
@@ -1670,15 +1670,17 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
		goto out_regs;



	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

		ret = i915_kick_out_vgacon(dev_priv);

		/* WARNING: Apparently we must kick fbdev drivers before vgacon,

		 * otherwise the vga fbdev driver falls over. */

		ret = i915_kick_out_firmware_fb(dev_priv);

		if (ret) {

			DRM_ERROR("failed to remove conflicting VGA console\n");

			DRM_ERROR("failed to remove conflicting framebuffer drivers\n");

			goto out_gtt;

		}



		ret = i915_kick_out_firmware_fb(dev_priv);

		ret = i915_kick_out_vgacon(dev_priv);

		if (ret) {

			DRM_ERROR("failed to remove conflicting framebuffer drivers\n");

			DRM_ERROR("failed to remove conflicting VGA console\n");

			goto out_gtt;

		}

	}

drivers/gpu/drm/i915/intel_pm.c

+0 −5
Original line number Diff line number Diff line
@@ -5469,11 +5469,6 @@ static void gen6_init_clock_gating(struct drm_device *dev) 
	I915_WRITE(_3D_CHICKEN,

		   _MASKED_BIT_ENABLE(_3D_CHICKEN_HIZ_PLANE_DISABLE_MSAA_4X_SNB));



	/* WaSetupGtModeTdRowDispatch:snb */

	if (IS_SNB_GT1(dev))

		I915_WRITE(GEN6_GT_MODE,

			   _MASKED_BIT_ENABLE(GEN6_TD_FOUR_ROW_DISPATCH_DISABLE));



	/* WaDisable_RenderCache_OperationalFlush:snb */

	I915_WRITE(CACHE_MODE_0, _MASKED_BIT_DISABLE(RC_OP_FLUSH_ENABLE));

drivers/gpu/drm/radeon/r600_dpm.c

+1 −1
Original line number Diff line number Diff line
@@ -1256,7 +1256,7 @@ int r600_parse_extended_power_table(struct radeon_device *rdev) 
					(mode_info->atom_context->bios + data_offset +

					 le16_to_cpu(ext_hdr->usPowerTuneTableOffset));

				rdev->pm.dpm.dyn_state.cac_tdp_table->maximum_power_delivery_limit =

					ppt->usMaximumPowerDeliveryLimit;

					le16_to_cpu(ppt->usMaximumPowerDeliveryLimit);

				pt = &ppt->power_tune_table;

			} else {

				ATOM_PPLIB_POWERTUNE_Table *ppt = (ATOM_PPLIB_POWERTUNE_Table *)

drivers/gpu/drm/radeon/radeon_encoders.c

+3 −0
Original line number Diff line number Diff line
@@ -179,6 +179,9 @@ static void radeon_encoder_add_backlight(struct radeon_encoder *radeon_encoder, 
		    (rdev->pdev->subsystem_vendor == 0x1734) &&

		    (rdev->pdev->subsystem_device == 0x1107))

			use_bl = false;

		/* disable native backlight control on older asics */

		else if (rdev->family < CHIP_R600)

			use_bl = false;

		else

			use_bl = true;

	}