New issue
Advanced search Search tips

Issue 661400 link

Starred by 1 user

Issue metadata

Status: WontFix
Owner: ----
Closed: Jul 2017
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 3
Type: Bug



Sign in to add a comment

Backport universal plane stuff to 3.10

Project Member Reported by gurcheta...@chromium.org, Nov 2 2016

Issue description

ugghh...

 
Project Member

Comment 1 by bugdroid1@chromium.org, Nov 8 2016

Labels: merge-merged-chromeos-3.10
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/a76250b96748574718017284a82329723818f6c9

commit a76250b96748574718017284a82329723818f6c9
Author: Matt Roper <matthew.d.roper@intel.com>
Date: Tue Apr 01 22:22:32 2014

BACKPORT: drm/i915: Restrict plane loops to only operate on overlay planes (v2)

Ensure that existing driver loops over all planes do not change behavior
when we begin adding new types of planes (primary and cursor) to the DRM
plane list in future patches.

v2: Switch to using drm_for_each_legacy_plane()

Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>

BUG= chromium:661400 
TEST=Tested on glimmer and nyan.

Checked if Chrome boots and ran modetest.
The returned planes are reported as overlays.

(cherry picked from commit af2b653bfb4ef40931b4d101ca842ce0c5da57ef)
Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>

Change-Id: I0a2e7c45c217dbea125e44dda1cc2fd07ee52a4a
Reviewed-on: https://chromium-review.googlesource.com/407597
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>

[modify] https://crrev.com/a76250b96748574718017284a82329723818f6c9/drivers/gpu/drm/i915/intel_display.c
[modify] https://crrev.com/a76250b96748574718017284a82329723818f6c9/drivers/gpu/drm/i915/intel_pm.c

Project Member

Comment 2 by bugdroid1@chromium.org, Nov 8 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/044e470f95761059acfcdc871803c330340b1f6a

commit 044e470f95761059acfcdc871803c330340b1f6a
Author: Matt Roper <matthew.d.roper@intel.com>
Date: Tue Apr 01 22:22:33 2014

BACKPORT: drm/shmobile: Restrict plane loops to only operate on legacy planes

Ensure that existing driver loops over all planes do not change behavior
when we begin adding new types of planes (primary and cursor) to the DRM
plane list in future patches.

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>

BUG= chromium:661400 
TEST=Tested on glimmer and nyan.

Checked if Chrome boots and ran modetest.
The returned planes are reported as overlays.

(cherry picked from commit 2b79dc13dc88c72c89fc9c4e4589bfc1139a441d)
Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>

Change-Id: Icd46b30eeae4f0ac569be547329af8fbc7f410f3
Reviewed-on: https://chromium-review.googlesource.com/407598
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>

[modify] https://crrev.com/044e470f95761059acfcdc871803c330340b1f6a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c

Project Member

Comment 3 by bugdroid1@chromium.org, Nov 8 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/63744b1a969ac522540a09a5e06ddde6475ee7ff

commit 63744b1a969ac522540a09a5e06ddde6475ee7ff
Author: Damien Lespiau <damien.lespiau@intel.com>
Date: Wed Sep 25 15:45:30 2013

BACKPORT: drm: Factor out common CRTC viewport checking code

Both setcrtc and page_flip are checking that the framebuffer is big
enough for the defined crtc viewport (x, y, hdisplay, vdisplay). Factor
that code out in a single function.

Reviewed-by: Ville Syrjl <ville.syrjala@linux.intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Acked-by: Dave Airlie <airlied@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

BUG= chromium:661400 
TEST=Tested on glimmer and nyan.

Checked if Chrome boots and ran modetest.
The returned planes are reported as overlays.

(cherry picked from commit c11e928360777be8eaf5023032e9b6c62eb2c43e)
Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>

Change-Id: I788e534ee43929bb8e42737464614e5c92980ce7
Reviewed-on: https://chromium-review.googlesource.com/407599
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>

[modify] https://crrev.com/63744b1a969ac522540a09a5e06ddde6475ee7ff/drivers/gpu/drm/drm_crtc.c

Project Member

Comment 4 by bugdroid1@chromium.org, Nov 8 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/23db831495d1c5881f2e78953ccf78ef5236eeab

commit 23db831495d1c5881f2e78953ccf78ef5236eeab
Author: Matt Roper <matthew.d.roper@intel.com>
Date: Tue Apr 01 22:22:34 2014

BACKPORT: drm: Make drm_crtc_check_viewport non-static

This function will be used by the universal plane helpers and may also
be useful for individual drivers.

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>

BUG= chromium:661400 
TEST=Tested on glimmer and nyan.

Checked if Chrome boots and ran modetest.
The returned planes are reported as overlays.

(cherry picked from commit af93629d1524dfff7df215b7de692f4de5ee855f)
Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>

Change-Id: I359496bb1a7b53d1b3c7edce83900e1a3f3217a3
Reviewed-on: https://chromium-review.googlesource.com/407600
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>

[modify] https://crrev.com/23db831495d1c5881f2e78953ccf78ef5236eeab/drivers/gpu/drm/drm_crtc.c
[modify] https://crrev.com/23db831495d1c5881f2e78953ccf78ef5236eeab/include/drm/drm_crtc.h

Project Member

Comment 5 by bugdroid1@chromium.org, Nov 8 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/47753a52bebb828071fbdd42e5e57505053cac1d

commit 47753a52bebb828071fbdd42e5e57505053cac1d
Author: Matt Roper <matthew.d.roper@intel.com>
Date: Tue Apr 01 22:22:35 2014

BACKPORT: drm: Add primary plane helpers (v3)

When we expose non-overlay planes to userspace, they will become
accessible via standard userspace plane API's.  We should be able to
handle the standard plane operations against primary planes in a generic
way via the modeset handler.

Drivers that can program primary planes more efficiently, that want to
use their own primary plane structure to track additional information,
or that don't have the limitations assumed by the helpers are free to
provide their own implementation of some or all of these handlers.

v3: Tweak kerneldoc formatting slightly to avoid ugliness
v2:
 - Move plane helpers to a new file (drm_plane_helper.c)
 - Tighten checks on update handler (check for scaling, CRTC coverage,
   subpixel positioning)
 - Pass proper panning parameters to modeset interface
 - Disallow disabling primary plane (and thus CRTC) if other planes are
   still active on the CRTC.
 - Use a minimal format list that should work on all hardware/drivers.
   Drivers may call this function with a more accurate plane list to
   enable additional formats they can support.

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>

BUG= chromium:661400 
TEST=Tested on glimmer and nyan.

Checked if Chrome boots and ran modetest.
The returned planes are reported as overlays.

(cherry picked from commit c103d1cfb3543f61ec44d4d15a84c888db84794d)
Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>

Change-Id: Ieaf972fe4addab3bd3a70c7d2ef3023de61f5736
Reviewed-on: https://chromium-review.googlesource.com/407601
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>

[add] https://crrev.com/47753a52bebb828071fbdd42e5e57505053cac1d/drivers/gpu/drm/drm_plane_helper.c
[modify] https://crrev.com/47753a52bebb828071fbdd42e5e57505053cac1d/drivers/gpu/drm/Makefile
[add] https://crrev.com/47753a52bebb828071fbdd42e5e57505053cac1d/include/drm/drm_plane_helper.h

Project Member

Comment 6 by bugdroid1@chromium.org, Nov 8 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/7a293e630cf5b2e3f3ff7e0ce50295325074f161

commit 7a293e630cf5b2e3f3ff7e0ce50295325074f161
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri Jun 14 22:13:15 2013

BACKPORT: drm: check that ->set_config properly updates the fb

Historically drm lacked fb refcounting, so the updating of crtc->fb
was done by the lower levels at a point convenient to get their own
refcounting (e.g. refcounts for the underlying gem bo, pinning
refcounts) right. With the introduction of refcounted fbs the drm core
handled the fb refcounts, but still relied on drivers to update the
crtc->fb pointer (this approach required the least invasive changes in
drivers).

Enforce this contract with a WARN_ON.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>

BUG= chromium:661400 
TEST=Tested on glimmer and nyan.

Checked if Chrome boots and ran modetest.
The returned planes are reported as overlays.

(cherry picked from commit cc85e1217f598f342b69dc44710d7a7355513a1b)
Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>

Change-Id: Iefc32f86ff726bb196917b67144701dd8a250413
Reviewed-on: https://chromium-review.googlesource.com/407961
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>

[modify] https://crrev.com/7a293e630cf5b2e3f3ff7e0ce50295325074f161/drivers/gpu/drm/drm_crtc.c

Project Member

Comment 7 by bugdroid1@chromium.org, Nov 8 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/8dfe3a048cd1efb6fef7c38c4f9122e8314c2502

commit 8dfe3a048cd1efb6fef7c38c4f9122e8314c2502
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri Jun 14 22:13:16 2013

BACKPORT: drm: fix fb leak in setcrtc

Drivers are allowed (actually have to) disable unrelated crtcs in
their ->set_config callback (when we steal all the connectors from
that crtc). If they do that they'll clear crtc->fb to NULL.

Which results in a refcount leak, since the drm core is keeping track
of that reference.

To fix this track the old fb of all crtcs and adjust references for
all of them. Of course, since we only hold an additional reference for
the fb for the current crtc we need to increase refcounts before we
drop the old one.

This approach has the benefit that it inches us a bit closer to an
atomic modeset world, where we want to update the config of all crtcs
in one step.

This regression has been introduce in the framebuffer refcount
conversion, specifically in

commit b0d1232589df5575c5971224ac4cb30e7e525884
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Tue Dec 11 01:07:12 2012 +0100

    drm: refcounting for crtc framebuffers

Reported-by: Russell King <linux@arm.linux.org.uk>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>

BUG= chromium:661400 
TEST=Tested on glimmer and nyan.

Checked if Chrome boots and ran modetest.
The returned planes are reported as overlays.

(cherry picked from commit 5cef29aa5227e6347145940a7bccde92fd9a1afa)
Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>

Change-Id: I98180a77c3519d1baa62305189e855f6984e16d8
Reviewed-on: https://chromium-review.googlesource.com/407962
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>

[modify] https://crrev.com/8dfe3a048cd1efb6fef7c38c4f9122e8314c2502/drivers/gpu/drm/drm_crtc.c
[modify] https://crrev.com/8dfe3a048cd1efb6fef7c38c4f9122e8314c2502/include/drm/drm_crtc.h

Project Member

Comment 8 by bugdroid1@chromium.org, Nov 9 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/0672c56e23e4d19f6aa566295376a33cad49e751

commit 0672c56e23e4d19f6aa566295376a33cad49e751
Author: Matt Roper <matthew.d.roper@intel.com>
Date: Tue Apr 01 22:22:36 2014

BACKPORT: drm: Add drm_universal_plane_init()

Add a new plane initialization interface for universal plane support
that allows a specific plane type (primary, cursor, or overlay) to
be specified.

drm_plane_init() remains as a compatibility API to reduce churn in
existing drivers.  The 'bool priv' parameter has been changed to
'bool is_primary' under the assumption that all existing uses of
private planes were representing primary planes.

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>

BUG= chromium:661400 
TEST=Tested on glimmer and nyan.

Checked if Chrome boots and ran modetest.
The returned planes are reported as overlays.

(cherry picked from commit dc415ff97d6b8f21cc6d264962f3a857a8d44650)
Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>

Change-Id: I4b3291373bbc2bc2e2c4432e3b8f5da4df2bcf24
Reviewed-on: https://chromium-review.googlesource.com/407602
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>

[modify] https://crrev.com/0672c56e23e4d19f6aa566295376a33cad49e751/drivers/gpu/drm/drm_crtc.c
[modify] https://crrev.com/0672c56e23e4d19f6aa566295376a33cad49e751/include/drm/drm_crtc.h

Project Member

Comment 9 by bugdroid1@chromium.org, Nov 9 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/13238308048cf09133603349b74fe1e7fe59d3f6

commit 13238308048cf09133603349b74fe1e7fe59d3f6
Author: Rob Clark <robdclark@gmail.com>
Date: Wed Apr 02 00:16:57 2014

BACKPORT: drm: Add plane type property (v2)

Add a plane type property to allow userspace to distinguish plane types.

v2: Driver-specific churn eliminated now that drm_plane_init() and
    drm_universal_plane_init() were separated out in a previous patch.

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>

BUG= chromium:661400 
TEST=Tested on glimmer and nyan.

Checked if Chrome boots and ran modetest.
The returned planes are reported as overlays.

(cherry picked from commit 9922ab5a7e4a4e089b2abfb1425590b97a7a90a3)
Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>

Change-Id: I3a60d29311f71c5c8dde88a5155311eb1fedb104
Reviewed-on: https://chromium-review.googlesource.com/407603
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>

[modify] https://crrev.com/13238308048cf09133603349b74fe1e7fe59d3f6/drivers/gpu/drm/drm_crtc.c
[modify] https://crrev.com/13238308048cf09133603349b74fe1e7fe59d3f6/include/drm/drm_crtc.h

Project Member

Comment 10 by bugdroid1@chromium.org, Nov 9 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/13238308048cf09133603349b74fe1e7fe59d3f6

commit 13238308048cf09133603349b74fe1e7fe59d3f6
Author: Rob Clark <robdclark@gmail.com>
Date: Wed Apr 02 00:16:57 2014

BACKPORT: drm: Add plane type property (v2)

Add a plane type property to allow userspace to distinguish plane types.

v2: Driver-specific churn eliminated now that drm_plane_init() and
    drm_universal_plane_init() were separated out in a previous patch.

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>

BUG= chromium:661400 
TEST=Tested on glimmer and nyan.

Checked if Chrome boots and ran modetest.
The returned planes are reported as overlays.

(cherry picked from commit 9922ab5a7e4a4e089b2abfb1425590b97a7a90a3)
Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>

Change-Id: I3a60d29311f71c5c8dde88a5155311eb1fedb104
Reviewed-on: https://chromium-review.googlesource.com/407603
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>

[modify] https://crrev.com/13238308048cf09133603349b74fe1e7fe59d3f6/drivers/gpu/drm/drm_crtc.c
[modify] https://crrev.com/13238308048cf09133603349b74fe1e7fe59d3f6/include/drm/drm_crtc.h

Project Member

Comment 11 by bugdroid1@chromium.org, Nov 9 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/4b44bc14603ac35032b60b808f2d3b8e98a85121

commit 4b44bc14603ac35032b60b808f2d3b8e98a85121
Author: Gurchetan Singh <gurchetansingh@chromium.org>
Date: Thu Nov 03 01:13:58 2016

CHROMIUM: drm: Replace crtc fb with primary plane fb in v3.10

This applies CL:195617 to the v3.10 kernel.  Here's what was done:

"This patch uses the coccinelle rules from commit f4510a275 to replace
crtc->fb with crtc->primary->fb.

For completeness, the rules are:

@@ struct drm_crtc C; @@
-   (C).fb
+   C.primary->fb
@@ struct drm_crtc *C; @@
-   (C)->fb
+   C->primary->fb
@@ struct drm_mode_set C; @@
-   (C).crtc->fb
+   C.crtc->primary->fb
@@ struct drm_mode_set *C; @@
-   (C)->crtc->fb
+   C->crtc->primary->fb

To run the script by hand:
spatch -sp_file ${RULES_FILE} --in-place --include-headers \
--all-includes -dir ${KERNEL_DIR} -I ${KERNEL_DIR}/include \
-I ${KERNEL_DIR}/drivers/gpu/drm"

BUG= chromium:661400 
TEST=Tested on glimmer and nyan.

Checked if Chrome boots and ran modetest.
The returned planes are reported as overlays.

Change-Id: Ifd7b734dae2447c933b47e8f4413f3c580486013
Reviewed-on: https://chromium-review.googlesource.com/407605
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Dominik Behr <dbehr@chromium.org>

[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/nouveau/dispnv04/crtc.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/gma500/oaktrail_crtc.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/qxl/qxl_display.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/nouveau/nouveau_display.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/omapdrm/omap_fb.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/i915/i915_irq.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/staging/imx-drm/ipuv3-crtc.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/i915/intel_overlay.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/nouveau/nv50_display.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/udl/udl_modeset.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/tegra/dc.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/exynos/exynos_drm_crtc.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/gma500/cdv_intel_display.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/gma500/psb_intel_sdvo.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/ast/ast_mode.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/gma500/psb_intel_display.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/omapdrm/omap_crtc.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/mgag200/mgag200_mode.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/radeon/atombios_crtc.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/radeon/radeon_connectors.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/drm_crtc_helper.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/i915/intel_dp.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/i915/intel_display.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/gma500/cdv_intel_dp.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/i915/intel_pm.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/radeon/radeon_device.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/gma500/mdfld_intel_display.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/drm_crtc.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/drm_fb_helper.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/radeon/radeon_display.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/evdi/evdi_modeset.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/cirrus/cirrus_mode.c
[modify] https://crrev.com/4b44bc14603ac35032b60b808f2d3b8e98a85121/drivers/gpu/drm/tilcdc/tilcdc_crtc.c

Project Member

Comment 12 by bugdroid1@chromium.org, Nov 9 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/6f8d1c5457b4f5ac1e6e67280d4943858d672ae8

commit 6f8d1c5457b4f5ac1e6e67280d4943858d672ae8
Author: Matt Roper <matthew.d.roper@intel.com>
Date: Tue Apr 01 22:22:41 2014

BACKPORT: drm: Remove unused drm_crtc->fb

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>

BUG= chromium:661400 
TEST=Tested on glimmer and nyan.

Checked if Chrome boots and ran modetest.
The returned planes are reported as overlays.

(cherry picked from commit 780f59847193eac97901ab6e74683956b4b0cf20)
Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>

Change-Id: If74c311384f8c83fc50554a58226b270ff21ca11
Reviewed-on: https://chromium-review.googlesource.com/407606
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Dominik Behr <dbehr@chromium.org>

[modify] https://crrev.com/6f8d1c5457b4f5ac1e6e67280d4943858d672ae8/include/drm/drm_crtc.h

Project Member

Comment 13 by bugdroid1@chromium.org, Nov 9 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/4d57d8ef3340c22899d99407494b33c27393fbe2

commit 4d57d8ef3340c22899d99407494b33c27393fbe2
Author: Nicolas Boichat <drinkcat@google.com>
Date: Mon Jun 22 07:42:24 2015

CHROMIUM: drm: Replace crtc fb with primary plane fb in lvds files

For some reason b72ad8c27b18a740669f265cf8eb508e8cfe3a38 ("CHROMIUM:
drm: Replace crtc fb with primary plane fb in v3.10") did not
update the _lvds.c files, which breaks kernel 3.10 compilation
on amd64-generic platform.

BUG= chromium:661400 
TEST=Tested on glimmer and nyan.

Checked if Chrome boots and ran modetest.
The returned planes are reported as overlays.

(cherry picked from commit fb386fde9e5ad0ebac856ab9a87c4d06d940d84e)
Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>

Change-Id: I8bb5d076ae672bc956d112dd163f3a5361f107e3
Reviewed-on: https://chromium-review.googlesource.com/407609
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Dominik Behr <dbehr@chromium.org>

[modify] https://crrev.com/4d57d8ef3340c22899d99407494b33c27393fbe2/drivers/gpu/drm/gma500/cdv_intel_lvds.c
[modify] https://crrev.com/4d57d8ef3340c22899d99407494b33c27393fbe2/drivers/gpu/drm/gma500/psb_intel_lvds.c

Project Member

Comment 14 by bugdroid1@chromium.org, Nov 9 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/4d57d8ef3340c22899d99407494b33c27393fbe2

commit 4d57d8ef3340c22899d99407494b33c27393fbe2
Author: Nicolas Boichat <drinkcat@google.com>
Date: Mon Jun 22 07:42:24 2015

CHROMIUM: drm: Replace crtc fb with primary plane fb in lvds files

For some reason b72ad8c27b18a740669f265cf8eb508e8cfe3a38 ("CHROMIUM:
drm: Replace crtc fb with primary plane fb in v3.10") did not
update the _lvds.c files, which breaks kernel 3.10 compilation
on amd64-generic platform.

BUG= chromium:661400 
TEST=Tested on glimmer and nyan.

Checked if Chrome boots and ran modetest.
The returned planes are reported as overlays.

(cherry picked from commit fb386fde9e5ad0ebac856ab9a87c4d06d940d84e)
Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>

Change-Id: I8bb5d076ae672bc956d112dd163f3a5361f107e3
Reviewed-on: https://chromium-review.googlesource.com/407609
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Dominik Behr <dbehr@chromium.org>

[modify] https://crrev.com/4d57d8ef3340c22899d99407494b33c27393fbe2/drivers/gpu/drm/gma500/cdv_intel_lvds.c
[modify] https://crrev.com/4d57d8ef3340c22899d99407494b33c27393fbe2/drivers/gpu/drm/gma500/psb_intel_lvds.c

Project Member

Comment 15 by bugdroid1@chromium.org, Nov 9 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/cdbdb0c87644766674a3b48e4a6b120ef9f713a0

commit cdbdb0c87644766674a3b48e4a6b120ef9f713a0
Author: Damien Lespiau <damien.lespiau@intel.com>
Date: Wed Sep 25 15:45:22 2013

BACKPORT: drm: Add a STEREO_3D capability to the SET_CLIENT_CAP ioctl

This capability allows user space to control the delivery of modes with
the 3D flags set. This is to not play games with current user space
users not knowing anything about stereo 3D flags and that could try
to set a mode with one or several of those bits set.

So, the plan is to remove the stereo modes from the list of modes we
give to DRM clients by default, and let them through if we are being
told otherwise.

stereo_allowed is bound to the drm_file structure to make it a
per-client setting, not a global one.

v2: Replace clearing 3D flags by discarding the stereo modes now that
    they are regular modes.
v3: SET_CAP -> SET_CLIENT_CAP rename (Chris Wilson)

Reviewed-by: Ville Syrjl <ville.syrjala@linux.intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Acked-by: Dave Airlie <airlied@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

BUG= chromium:661400 
TEST=Tested on glimmer and nyan.

Checked if Chrome boots and ran modetest.
The returned planes are reported as overlays.

(cherry picked from commit 61d8e3282541139cf5bb31e4c42f952a6cc168f8)
Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>

Change-Id: I06fb2dd8a87ceff2d11154f83e8b3a423045a99a
Reviewed-on: https://chromium-review.googlesource.com/407963
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Dominik Behr <dbehr@chromium.org>

[modify] https://crrev.com/cdbdb0c87644766674a3b48e4a6b120ef9f713a0/include/drm/drmP.h
[modify] https://crrev.com/cdbdb0c87644766674a3b48e4a6b120ef9f713a0/include/uapi/drm/drm.h
[modify] https://crrev.com/cdbdb0c87644766674a3b48e4a6b120ef9f713a0/drivers/gpu/drm/drm_ioctl.c
[modify] https://crrev.com/cdbdb0c87644766674a3b48e4a6b120ef9f713a0/drivers/gpu/drm/drm_crtc.c

Project Member

Comment 16 by bugdroid1@chromium.org, Nov 12 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/ef34b5842c53dec2947da1ae0aaaae6f7d0add12

commit ef34b5842c53dec2947da1ae0aaaae6f7d0add12
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed Apr 23 13:15:32 2014

BACKPORT: drm/tegra: restrict plane loops to legacy planes

In Matt Ropers primary plane series a set of prep patches like

commit af2b653bfb4ef40931b4d101ca842ce0c5da57ef
Author: Matt Roper <matthew.d.roper@intel.com>
Date:   Tue Apr 1 15:22:32 2014 -0700

    drm/i915: Restrict plane loops to only operate on overlay planes (v2)

ensured that all exisiting users of the mode_config->plane_list
wouldn't change behaviour. Unfortunately tegra seems to have fallen
through the cracks. Fix it.

This regression was introduced in

commit e13161af80c185ecd8dc4641d0f5df58f9e3e0af
Author: Matt Roper <matthew.d.roper@intel.com>
Date:   Tue Apr 1 15:22:38 2014 -0700

    drm: Add drm_crtc_init_with_planes() (v2)

The result was that we've unref'ed the fb for the primary plane twice,
leading to a use-after free bug. This is because the drm core will
already set crtc->primary->fb to NULL and do the unref for us, and the
crtc disable hook is called by the drm crtc helpers for exactly this
case.

Aside: Now that the fbdev helpers clean up planes there's no longer a
need to do this in drivers. So this could probably be nuked entirely
in linux-next.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

Conflicts:
	drivers/gpu/drm/tegra/dc.c

BUG= chromium:661400 ,  chromium:664406 
TEST=nyan_big doesn't restart after closing the lid when logged into
     Chrome

(cherry picked from commit 2b4c36612efac173397756398000921a7771fdda)
Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>

Change-Id: Ia6485202de4d091d52e04ce492431d6fcd53ace3
Reviewed-on: https://chromium-review.googlesource.com/410272
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Haixia Shi <hshi@chromium.org>

[modify] https://crrev.com/ef34b5842c53dec2947da1ae0aaaae6f7d0add12/drivers/gpu/drm/tegra/dc.c

Status: WontFix (was: Untriaged)

Sign in to add a comment