Commit 1df73488 authored by Nrithya Kanakasabapathy's avatar Nrithya Kanakasabapathy
Browse files

Merge branch 'whitechapel' into android-gs-pixel-mainline



* whitechapel:
  edgetpu: remove dma_addrs from dmabuf map entry
  edgetpu: add shrunk_sgt to dmabuf entry
  edgetpu: remove IOVMM workaround
  edgetpu: implement mmu_tpu_map_sgt
  edgetpu: mmu add edgetpu_mmu_tpu_map_sgt
  Revert "edgetpu: abrolhos: disable thermal throttling as workaround"
  Revert "edgetpu: abrolhos thermal remove unused var pwr_state"

Signed-off-by: default avatarNrithya Kanakasabapathy <nrithya@google.com>
Change-Id: Ie787e29b0643d284b5c411c15b447ee294b02ce6
parent 3ac166fd
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment