Home Home > GIT Browse > stable-xen
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2017-07-18 09:42:35 -0400
committerJeff Mahoney <jeffm@suse.com>2017-07-18 09:42:35 -0400
commite078376009b7b63c698e3ec23da13daa3d3fdca7 (patch)
treed09f5a55c655d75ca799a450d86d7dabe073561c
parentd41b6e7871d660923c20ebeb2f2ae7254a13da75 (diff)
parentf6f228c12e7e67f5096b0811474a51239b3bf2f8 (diff)
Merge remote-tracking branch 'origin/users/tiwai/master/for-next'
-rw-r--r--patches.fixes/drm-i915-Fix-S4-resume-breakage36
-rw-r--r--rpm/kernel-docs.spec.in29
-rw-r--r--series.conf1
3 files changed, 21 insertions, 45 deletions
diff --git a/patches.fixes/drm-i915-Fix-S4-resume-breakage b/patches.fixes/drm-i915-Fix-S4-resume-breakage
deleted file mode 100644
index e74f780ffe..0000000000
--- a/patches.fixes/drm-i915-Fix-S4-resume-breakage
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Takashi Iwai <tiwai@suse.de>
-Subject: drm/i915: Fix S4 resume breakage
-Patch-mainline: Submitted, suggested on ML
-References: bsc#984629,bsc#984632,bsc#993472
-
-We've seen S4 resume breakage on many Intel machines with SP2 kernel,
-where typically the machine gets a memory corruption or kernel Oops /
-panic. This problem was seen even on the upstream kernel, and through
-the bisection, it was pointed to be a side-effect of the commit:
- 4c436d55b279bbc6b02aac02e7dc683fc09f884e
- drm/i915: Enable Resource Streamer state save/restore on MI_SET_CONTEXT
-
-This patch fixes the regression by forcibly calling the GPU reset
-at prerequiste of PM S4 restore, as was suggested by the i915
-upstream dev.
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-
----
- drivers/gpu/drm/i915/i915_drv.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/gpu/drm/i915/i915_drv.c
-+++ b/drivers/gpu/drm/i915/i915_drv.c
-@@ -1946,6 +1946,11 @@ static int i915_pm_thaw(struct device *d
- /* restore: called after loading the hibernation image. */
- static int i915_pm_restore_early(struct device *kdev)
- {
-+ struct pci_dev *pdev = to_pci_dev(kdev);
-+ struct drm_device *dev = pci_get_drvdata(pdev);
-+
-+ /* for avoiding the memory corruption at S4 resume (bsc#984624) */
-+ intel_gpu_reset(to_i915(dev), ALL_ENGINES);
- return i915_pm_resume_early(kdev);
- }
-
diff --git a/rpm/kernel-docs.spec.in b/rpm/kernel-docs.spec.in
index c342939f88..6854200a3c 100644
--- a/rpm/kernel-docs.spec.in
+++ b/rpm/kernel-docs.spec.in
@@ -21,7 +21,8 @@
%include %_sourcedir/kernel-spec-macros
-# rst2pdf is broken with Sphinx 1.3.x, so disabled for now
+%define build_html 1
+# still something wrong with Tex Live 2017...
%define build_pdf 0
# copy the whole tree to generate some images (sigh...)
@@ -34,7 +35,7 @@
%endif
Name: kernel-docs@VARIANT@
-Summary: Kernel Documentation (man pages)
+Summary: Kernel Documentation
License: GPL-2.0
Group: Documentation/Man
Version: @RPMVERSION@
@@ -44,13 +45,17 @@ Release: <RELEASE>.g@COMMIT@
Release: @RELEASE@
%endif
BuildRequires: kernel-source%variant
-# remaining stuff, to be fixed after 4.12
-BuildRequires: xmlto
+%if %build_pdf || %build_html
# ReST handling
BuildRequires: graphviz
BuildRequires: python-Sphinx
+BuildRequires: texlive-anyfontsize
%if %build_pdf
-BuildRequires: python-rst2pdf
+BuildRequires: python2-Sphinx-latex
+BuildRequires: texlive-dejavu
+BuildRequires: texlive-xetex
+BuildRequires: texlive-zapfding
+%endif
%endif
Url: http://www.kernel.org/
Provides: %name = %version-%source_rel
@@ -59,7 +64,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: kernel-spec-macros
%description
-These are the man pages (section 9) built from the current kernel sources.
+A few basic documents from the current kernel sources.
%source_timestamp
@@ -74,6 +79,7 @@ These are PDF documents built from the current kernel sources.
%source_timestamp
%endif
+%if %build_html
%package html
Summary: Kernel Documentation (HTML)
Group: Documentation/HTML
@@ -82,6 +88,7 @@ Group: Documentation/HTML
These are HTML documents built from the current kernel sources.
%source_timestamp
+%endif
%prep
%setup -T -c
@@ -92,22 +99,26 @@ cp -a /usr/src/linux%variant/* .
%build
export LANG=en_US
+%if %build_html
mkdir -p html
make %{?make_arg} O=$PWD/html htmldocs
+%endif
%if %build_pdf
mkdir -p pdf
make %{?make_arg} O=$PWD/pdf pdfdocs
%endif
%install
+%if %build_html
install -d $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/rst
cp -a html/Documentation/output/* $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/rst || true
+%endif
%if %build_pdf
install -d $RPM_BUILD_ROOT%{_datadir}/doc/kernel/pdf
# copy PDF files generated by sphinx (once when it really works...)
-for i in pdf/Documentation/output/*.pdf; do
- test -s $i && cp -a $i $RPM_BUILD_ROOT%{_datadir}/doc/kernel/pdf
+for i in pdf/Documentation/output/latex/*.pdf; do
+ cp -a $i $RPM_BUILD_ROOT%{_datadir}/doc/kernel/pdf
done
%endif
@@ -127,10 +138,12 @@ cp -a %linux_src/{COPYING,CREDITS,MAINTAINERS,README} .
%{_datadir}/doc/kernel/pdf
%endif
+%if %build_html
%files html
%defattr(-,root,root)
%dir %{_datadir}/doc/kernel
%docdir %{_datadir}/doc/kernel/html
%{_datadir}/doc/kernel/html
+%endif
%changelog
diff --git a/series.conf b/series.conf
index 6423874604..6030920488 100644
--- a/series.conf
+++ b/series.conf
@@ -312,7 +312,6 @@
########################################################
# DRM/Video
########################################################
- patches.fixes/drm-i915-Fix-S4-resume-breakage
+jdelvare patches.fixes/drm-amdgpu-revert-update-tile-table-for-oland-hainan.patch
########################################################