[v8,0/5] drm/i915: Support for integrated privacy screens

Message

Rajat Jain March 12, 2020, 12:57 a.m. UTC

This patchset adds support for integrated privacy screen on some laptops
using the ACPI methods to detect and control the feature.

Rajat Jain (5):
  intel_acpi: Rename drm_dev local variable to dev
  drm/connector: Add support for privacy-screen property
  drm/i915: Lookup and attach ACPI device node for connectors
  drm/i915: Add helper code for ACPI privacy screen
  drm/i915: Enable support for integrated privacy screen

 drivers/gpu/drm/drm_atomic_uapi.c             |   4 +
 drivers/gpu/drm/drm_connector.c               |  51 +++++
 drivers/gpu/drm/i915/Makefile                 |   3 +-
 drivers/gpu/drm/i915/display/intel_acpi.c     |  30 ++-
 drivers/gpu/drm/i915/display/intel_atomic.c   |   2 +
 drivers/gpu/drm/i915/display/intel_ddi.c      |   1 +
 .../drm/i915/display/intel_display_types.h    |   5 +
 drivers/gpu/drm/i915/display/intel_dp.c       |  48 ++++-
 drivers/gpu/drm/i915/display/intel_dp.h       |   5 +
 .../drm/i915/display/intel_privacy_screen.c   | 184 ++++++++++++++++++
 .../drm/i915/display/intel_privacy_screen.h   |  27 +++
 drivers/gpu/drm/i915/i915_drv.h               |   2 +
 include/drm/drm_connector.h                   |  24 +++
 13 files changed, 382 insertions(+), 4 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/display/intel_privacy_screen.c
 create mode 100644 drivers/gpu/drm/i915/display/intel_privacy_screen.h

Comments

Rajat Jain March 12, 2020, 5:52 a.m. UTC | #1

Hi,

Can some one please let me know on which branch does this script try
to apply the patches so that I can fix the error?

Currently I had sent my patchset rebased on top of drm-intel-next-queued.

Thanks,

Rajat

On Wed, Mar 11, 2020 at 9:04 PM Patchwork
<[e-mail]> wrote:
>
> == Series Details ==
>
> Series: drm/i915: Support for integrated privacy screens
> URL   : https://patchwork.freedesktop.org/series/74607/
> State : failure
>
> == Summary ==
>
> Applying: intel_acpi: Rename drm_dev local variable to dev
> Applying: drm/connector: Add support for privacy-screen property
> Using index info to reconstruct a base tree...
> M       drivers/gpu/drm/drm_connector.c
> M       include/drm/drm_connector.h
> Falling back to patching base and 3-way merge...
> Auto-merging include/drm/drm_connector.h
> CONFLICT (content): Merge conflict in include/drm/drm_connector.h
> Auto-merging drivers/gpu/drm/drm_connector.c
> error: Failed to merge in the changes.
> hint: Use 'git am --show-current-patch' to see the failed patch
> Patch failed at 0002 drm/connector: Add support for privacy-screen property
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
>