Android 12.0.0 release 15

[ 99% 248/250] out/soong/.bootstrap/bin/soong_build out/soong/build.ninja
FAILED: out/soong/build.ninja
cd "$(dirname "out/soong/.bootstrap/bin/soong_build")" && BUILDER="$PWD/$(basename "out/soong/.bootstrap/bin/soong_build")" && cd / && env -i "$BUILDER"     --top "$TOP"     --out "out/soong"     -n "out"     -d "out/soong/build.ninja.d"     -t -l out/.module_paths/Android.bp.list -globFile out/soong/.bootstrap/build-globs.ninja -o out/soong/build.ninja --available_env out/soong/soong.environment.available --used_env out/soong/soong.environment.used Android.bp
error: external/minigbm/Android.bp:124:1: "libgbm" depends on undefined module "libdrm_headers"
09:12:11 soong bootstrap failed with: exit status 1

Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

In the case of error, apu_device_online returns a error code.
But an error usually means that the APU is offline (or doesn't exist)
so we must return 0 instead of the error code.

Signed-off-by: Alexandre Bailon <abailon@baylibre.com>

Add support of APU

See merge request baylibre/iot-ml/drm!2

This adds an Android.bp, required to build the libdrm
for the APU.

Signed-off-by: Alexandre Bailon <abailon@baylibre.com>
Change-Id: I968b81bafeae00a43342d349eb77670469d8a41f

This adds support of a new ioctl that could be used
to allocate a gem from an user pointer.
The goal is to reduce the number of memory copy.

Signed-off-by: Alexandre Bailon <abailon@baylibre.com>

The driver creates the device before that the firmware is loaded
so we must check that the firmware is loaded and the APU is operational
before trying to use it.

Signed-off-by: Alexandre Bailon <abailon@baylibre.com>

This adds the support APU (AI Processor Unit).

Signed-off-by: Alexandre Bailon <abailon@baylibre.com>

Inseob Kim authored 4 years ago and Alexandre Bailon committed 3 years ago

drm_property_type_is function in xf86drmMode.h file can cause compiler
error because it performs unsigned to signed conversion. Some Android.mk
modules have been avoiding this by adding "-isystem external/libdrm"
flag, because warnings from system headers are suppressed.

This changes exported_include_dirs to export_system_include_dirs
to workaround the potential error with the same manner above.

Bug: 157106227
Test: include xf86drmMode.h with -Wconversion
Change-Id: I13eaccd20d9a6582c75b7f1ec2657b20205cd952
Merged-In: I13eaccd20d9a6582c75b7f1ec2657b20205cd952
(cherry picked from commit 06b698c2)

Change-Id: I90130bea8580beb7cc15736227b6b8b8962b56ab

Bug: 191720818

Change-Id: Ia5bd5a907c21478e265218516c547549d98ea196
Merged-in: Ia5bd5a907c21478e265218516c547549d98ea196

Change-Id: I98910f2125a11fb44c46a9a93628a6239e300f63

Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 18dbf64e am: fd6dc07b am: 907cd0eb

Original change: https://android-review.googlesource.com/c/platform/external/libdrm/+/1611940

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4dece877244e6a3641918f9563378753c8bb3d4f

Original change: https://android-review.googlesource.com/c/platform/external/libdrm/+/1611940

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25e3db92ff7d5236e295d98f2e67adebf5d6d200

Original change: https://android-review.googlesource.com/c/platform/external/libdrm/+/1611940

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb02ee58fd5f1e948a59abcc24c1a01d646e6bd3

Bug: 177448161
Change-Id: I042b302dcea228d7697524bef71e66fcce7a112f

If info.count is large, drmMalloc() / alloca() may fail, and the
resulting null pointer is not null checked before dereference.

Issue: https://gitlab.freedesktop.org/mesa/drm/-/issues/62



Reviewed-by: Simon Ser <contact@emersion.fr>
Signed-off-by: Alistair Delva <adelva@google.com>

Add the PCI ID import for JSL.

V1 - Indentation
Signed-off-by: Tejas Upadhyay <tejaskumarx.surendrakumar.upadhyay@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>

Do as the documentation says - when devices non NULL, cap the reported
devices to max_devices. Otherwise we risk out-of-bound access
for users of the API.

v2:
 - Fix this w/o breaking the API

v3:
 - Drop local variables, flip inverted conditional (Simon)

Issue: https://gitlab.freedesktop.org/mesa/drm/-/issues/56


Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Simon Ser <contact@emersion.fr>

This reverts commit 8cb12a25.

The commit fixed the OOB, yet it broke drmDevices2(0, NULL, 0) - aka we
did not return the total devices list.

Reviewed-by: Simon Ser <contact@emersion.fr>

Users need to be careful when using drmPrimeHandleToFD or
drmPrimeFDToHandle directly. Mention GBM as a solution.

See [1] for an example mistake.

[1]: https://gitlab.freedesktop.org/drm/nouveau/-/issues/43#note_772661



Signed-off-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

If a device has a primary node, it doesn't necessarily mean it's
suitable for KMS usage. For instance, render-only drivers also
expose primary nodes.

The check is extracted from Weston [1].

The motivation for this new function is two-fold:

- Avoid an unnecessary GETRESOURCES call. To check whether a
  primary node is suitable for KMS, we don't actually need to
  retrieve the object IDs we just need to check the counts.
- Avoid confusion in user-space and make sure user-space implements
  the check properly. For instance, wlroots doesn't [2]: it uses
  drmGetVersion which succeeds with render-only drivers.

[1]: https://gitlab.freedesktop.org/wayland/weston/-/blob/master/libweston/backend-drm/drm.c#L2689
[2]: https://github.com/swaywm/wlroots/blob/a290d7a78dc36275e24e54f84570f37a66dc67a4/backend/session/session.c#L268



Signed-off-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

amdgpu_drm: sync up with the latest amdgpu_drm.h based on drm-next (https://cgit.freedesktop.org/drm/drm)

What are these headers?
Adding currently missing stuff from https://cgit.freedesktop.org/drm/drm/tree/include/uapi/drm/amdgpu_drm.h based on
the latest commit there:

commit f730f39eb981af249d57336b47cfe3925632a7fd (HEAD -> drm-next, tag: drm-next-2021-02-19, origin/drm-next, origin/HEAD)
Merge: 4f8ad4045b38 81ce8f04aa96
Author: Dave Airlie <airlied@redhat.com>
Date:   Fri Feb 19 13:54:29 2021 +1000

    Merge tag 'drm-intel-next-fixes-2021-02-18' of git://anongit.freedesktop.org/drm/drm-intel into drm-next

Which headers go where?
From https://cgit.freedesktop.org/drm/drm/tree/include/uapi/drm/amdgpu_drm.h to
https://cgit.freedesktop.org/mesa/drm/tree/include/drm/amdgpu_drm.h

When and which headers to update?
If the kernel uapi drm header changes, the header here should be sync-ed.

When and how to update these files
The steps for generating this patch:

 - Switch to freedesktop drm-next kernel branch (https://cgit.freedesktop.org/drm/drm);
 - Install the headers via `make headers_install';
 - Copy from kernel "include/uapi/drm/amdgpu_drm.h" to libdrm "include/drm/amdgpu_drm.h";
 - generate the patch;

The commits from drm-next (https://cgit.freedesktop.org/drm/drm

) are:

Mauro Carvalho Chehab (1)
c45dd3bda1c809eb120452597097e14a96b58c1f drm/amdgpu: fix some kernel-doc markups

Huang Rui(3)
6fbcb00c7984fa7d49af2c361453c0397cdea400 drm/amdgpu: add TOC firmware definition
1e483203965bdab466af0739c1edf7da07da241d drm/amdgpu: add uapi to define van gogh memory type
f7b2cdb23abf62bc3d33c2e0b0009a09412ff475 drm/amdgpu: add uapi to define van gogh series

Pierre-Eric Pelloux-Prayer(1)
16c642ec3fe9a144fbe1e97dc56f13a6308f1381 drm/amdgpu: new ids flag for tmz (v2)

Yong Zhao(1)
130c88931f6cbdb4513d307b4a13fcfff08a8041 drm/amdgpu: Improve the MTYPE comments

Signed-off-by: Leo Liu <leo.liu@amd.com>

Change-Id: I65aae6a51aca9497a90b0ccc0950b0d7722a9880

[automerger skipped] Mark ab/7061308 as merged in stage. am: 6d68c928 -s ours am: d64a10e0 -s ours

am skip reason: Change-Id I5a5d92387d74ce25f452255dc2da307ae0af4eb7 with SHA-1 fb939210 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a96f4a04e3135590efb2ee8d8d2bea739e1f9cf

am skip reason: Change-Id I5a5d92387d74ce25f452255dc2da307ae0af4eb7 with SHA-1 fb939210 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9863e72f1e8a01d7f9fc2bd65b323e61cb32c92

Bug: 180401296
Merged-In: I5a5d92387d74ce25f452255dc2da307ae0af4eb7
Change-Id: I3b5b461f2b6270e38f4edeec84f00f8261b156c2

This enables drm_intel_bufmgr on ADLS

Signed-off-by: Tejas Upadhyay <tejaskumarx.surendrakumar.upadhyay@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>

Align with kernel commits:

0883d63b19bb ("drm/i915/adl_s: Add ADL-S platform info and PCI ids")
04057a1afc75 ("drm/i915: Sort EHL/JSL PCI IDs")
0e8e272f1368 ("drm/i915/ehl: Remove invalid PCI ID")
605f9c290c1a ("drm/i915: Sort ICL PCI IDs")
514dc424ce4f ("drm/i915: Sort CNL PCI IDs")
32d4ec9a1681 ("drm/i915: Sort CFL PCI IDs")
df3478af1d73 ("drm/i915: Sort CML PCI IDs")
cd988984cbea ("drm/i915: Sort KBL PCI IDs")
b04d36f73771 ("drm/i915: Sort SKL PCI IDs")
9c0b2d30441b ("drm/i915: Sort HSW PCI IDs")
79033a0a7898 ("drm/i915: Ocd the HSW PCI ID hex numbers")
cfb3db8fdae2 ("drm/i915: Try to fix the SKL GT3/4 vs. GT3e/4e comments")
03e399020cd2 ("drm/i915: Add SKL GT1.5 PCI IDs")
812f044df08c ("drm/i915: Reclassify SKL 0x1923 and 0x1927 as ULT")
194909a32aed ("drm/i915: Reclassify SKL 0x192a as GT3")
82e84284ab7d ("drm/i915: Update Haswell PCI IDs")
24ea098b7c0d ("drm/i915/jsl: Split EHL/JSL platform info and PCI ids")
b50b7991b739 ("drm/i915/dg1: add more PCI ids")
d452bd091e16 ("drm/i915: break TGL pci-ids in GT 1 & 2")
f2bde2546b81 ("drm/i915: Remove dubious Valleyview PCI IDs")
0883d63b19bb ("drm/i915/adl_s: Add ADL-S platform info and PCI ids")
04057a1afc75 ("drm/i915: Sort EHL/JSL PCI IDs")
0e8e272f1368 ("drm/i915/ehl: Remove invalid PCI ID")
605f9c290c1a ("drm/i915: Sort ICL PCI IDs")
514dc424ce4f ("drm/i915: Sort CNL PCI IDs")
32d4ec9a1681 ("drm/i915: Sort CFL PCI IDs")
df3478af1d73 ("drm/i915: Sort CML PCI IDs")
cd988984cbea ("drm/i915: Sort KBL PCI IDs")
b04d36f73771 ("drm/i915: Sort SKL PCI IDs")
9c0b2d30441b ("drm/i915: Sort HSW PCI IDs")
79033a0a7898 ("drm/i915: Ocd the HSW PCI ID hex numbers")
cfb3db8fdae2 ("drm/i915: Try to fix the SKL GT3/4 vs. GT3e/4e comments")
03e399020cd2 ("drm/i915: Add SKL GT1.5 PCI IDs")
812f044df08c ("drm/i915: Reclassify SKL 0x1923 and 0x1927 as ULT")
194909a32aed ("drm/i915: Reclassify SKL 0x192a as GT3")
82e84284ab7d ("drm/i915: Update Haswell PCI IDs")
24ea098b7c0d ("drm/i915/jsl: Split EHL/JSL platform info and PCI ids")
b50b7991b739 ("drm/i915/dg1: add more PCI ids")
d452bd091e16 ("drm/i915: break TGL pci-ids in GT 1 & 2")

Signed-off-by: Tejas Upadhyay <tejaskumarx.surendrakumar.upadhyay@intel.com>
Reviewed-by: Landwerlin, Lionel G <lionel.g.landwerlin@intel.com>

Change-Id: I644d79ea1ca8ca9039b7eeccbc60cc74fd5609ca

Original change: https://android-review.googlesource.com/c/platform/external/libdrm/+/1588229

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62cc957bf0975f38326f0ba13e760f239e264dd1

Original change: https://android-review.googlesource.com/c/platform/external/libdrm/+/1588229

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If0a06759987e98ac0720e88421c7ff1b817bc7c5

Original change: https://android-review.googlesource.com/c/platform/external/libdrm/+/1588229

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c55b3354df61c12dcb92ab20501391a2d75c806

From 20.45 release.

Acked-by: Simon Ser <contact@emersion.fr>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Added SPDX-license-identifier-BSD SPDX-license-identifier-MIT to:
  intel/Android.bp

Added SPDX-license-identifier-BSD SPDX-license-identifier-MIT
    legacy_unencumbered
to:
  Android.bp

Added SPDX-license-identifier-MIT
to:
  amdgpu/Android.bp
  data/Android.bp
  etnaviv/Android.bp
  freedreno/Android.bp
  libkms/Android.bp
  nouveau/Android.bp
  omap/Android.bp
  radeon/Android.bp
  tegra/Android.bp
  tests/Android.bp
  tests/modetest/Android.bp
  tests/proptest/Android.bp
  tests/util/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I4e538e414dc10579ff32861ee79129765d1d6a8e

- Remove one unused variable.
- Convert two int-s into 'unsigned int'.
Motivated by a failed build of Chromium.

Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Victor Hugo Vianna Silva <victor.vianna10@gmail.com>

Do as the documentation says - cap the number of reported devices to the
requested amount - aka max_devices. Otherwise we risk out-of-bound access
for users of the API.

Issue: https://gitlab.freedesktop.org/mesa/drm/-/issues/56


Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Simon Ser <contact@emersion.fr>

Remove useless codes.

Signed-off-by: Sonny Jiang <sonny.jiang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>

add dimgrey_cavefish chip id in vcn test

Signed-off-by: James Zhu <James.Zhu@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>

add navy_flounder chip id in vcn test

Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Jiansong Chen <Jiansong.Chen@amd.com>

Add an entry for the "mxsfb-drm" driver, so that the test utilities
work with the mxsfb driver without passing the -M argument.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>