diff --git a/0001-Revert-drm-i915-revert-eDP-bpp-clamping-code-changes.patch b/0001-Revert-drm-i915-revert-eDP-bpp-clamping-code-changes.patch deleted file mode 100644 index 1b37e3883..000000000 --- a/0001-Revert-drm-i915-revert-eDP-bpp-clamping-code-changes.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 883e2c26855e19e19bfb985221ae5a09db26a1c4 Mon Sep 17 00:00:00 2001 -From: Josh Boyer -Date: Fri, 3 May 2013 17:10:32 -0400 -Subject: [PATCH] Revert "drm/i915: revert eDP bpp clamping code changes" - -This reverts commit 57c219633275c7e7413f8bc7be250dc092887458. ---- - drivers/gpu/drm/i915/intel_dp.c | 18 ++++-------------- - 1 file changed, 4 insertions(+), 14 deletions(-) - -diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c -index fb2fbc1..e0ee2ca 100644 ---- a/drivers/gpu/drm/i915/intel_dp.c -+++ b/drivers/gpu/drm/i915/intel_dp.c -@@ -702,6 +702,9 @@ intel_dp_compute_config(struct intel_encoder *encoder, - /* Walk through all bpp values. Luckily they're all nicely spaced with 2 - * bpc in between. */ - bpp = min_t(int, 8*3, pipe_config->pipe_bpp); -+ if (is_edp(intel_dp) && dev_priv->edp.bpp) -+ bpp = min_t(int, bpp, dev_priv->edp.bpp); -+ - for (; bpp >= 6*3; bpp -= 2*3) { - mode_rate = intel_dp_link_required(target_clock, bpp); - -@@ -739,6 +742,7 @@ found: - intel_dp->link_bw = bws[clock]; - intel_dp->lane_count = lane_count; - adjusted_mode->clock = drm_dp_bw_code_to_link_rate(intel_dp->link_bw); -+ pipe_config->pipe_bpp = bpp; - pipe_config->pixel_target_clock = target_clock; - - DRM_DEBUG_KMS("DP link bw %02x lane count %d clock %d bpp %d\n", -@@ -751,20 +755,6 @@ found: - target_clock, adjusted_mode->clock, - &pipe_config->dp_m_n); - -- /* -- * XXX: We have a strange regression where using the vbt edp bpp value -- * for the link bw computation results in black screens, the panel only -- * works when we do the computation at the usual 24bpp (but still -- * requires us to use 18bpp). Until that's fully debugged, stay -- * bug-for-bug compatible with the old code. -- */ -- if (is_edp(intel_dp) && dev_priv->edp.bpp) { -- DRM_DEBUG_KMS("clamping display bpc (was %d) to eDP (%d)\n", -- bpp, dev_priv->edp.bpp); -- bpp = min_t(int, bpp, dev_priv->edp.bpp); -- } -- pipe_config->pipe_bpp = bpp; -- - return true; - } - --- -1.8.2.1 - diff --git a/kernel.spec b/kernel.spec index 859696cca..354cbc341 100644 --- a/kernel.spec +++ b/kernel.spec @@ -62,7 +62,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 2 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -95,7 +95,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 1 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -729,9 +729,6 @@ Patch22001: selinux-apply-different-permission-to-ptrace-child.patch #rhbz 927469 Patch23006: fix-child-thread-introspection.patch -# Fix i915 on Macbook Pro 10,2 machines -Patch25015: 0001-Revert-drm-i915-revert-eDP-bpp-clamping-code-changes.patch - Patch25016: tglx.patch #rhbz 961527 @@ -1414,9 +1411,6 @@ ApplyPatch 0001-kmsg-Honor-dmesg_restrict-sysctl-on-dev-kmsg.patch #rhbz 927469 ApplyPatch fix-child-thread-introspection.patch -# Fix i915 on Macbook Pro 10,2 machines -ApplyPatch 0001-Revert-drm-i915-revert-eDP-bpp-clamping-code-changes.patch - ApplyPatch tglx.patch #rhbz 961527 @@ -2242,6 +2236,9 @@ fi # ||----w | # || || %changelog +* Mon May 13 2013 Josh Boyer - 3.10.0-0.rc1.git1.1 +- Linux v3.10-rc1-34-g1f63876 + * Mon May 13 2013 Josh Boyer - Add radeon fixes for PCI-e gen2 speed issues (rhbz 961527) diff --git a/sources b/sources index bed5f43d4..913b7153b 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 4348c9b6b2eb3144d601e87c19d5d909 linux-3.9.tar.xz d008b8a2a1dd16b88014d7c223a12ce9 patch-3.10-rc1.xz +54fa158807505082daf005aeeedc01c4 patch-3.10-rc1-git1.xz