Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6774266a authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 227b6ebb on remote branch 

Change-Id: Iac94c1f541aa3956af7e0e82bf886eb9b5aeda22
parents 396947fa 227b6ebb

Documentation/gpu/drm-client.rst

0 → 100644
+15 −0
Original line number Diff line number Diff line 
=================

Kernel clients

=================



.. kernel-doc:: drivers/gpu/drm/drm_client.c

   :doc: overview



.. kernel-doc:: include/drm/drm_client.h

   :internal:



.. kernel-doc:: drivers/gpu/drm/drm_client.c

   :export:



.. kernel-doc:: drivers/gpu/drm/drm_client_modeset.c

   :export:

Documentation/gpu/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Linux GPU Driver Developer's Guide 
   drm-kms

   drm-kms-helpers

   drm-uapi

   drm-client

   i915

   vga-switcheroo

   vgaarbiter

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y) 
$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")

endif

GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))

CLANG_FLAGS	+= --prefix=$(GCC_TOOLCHAIN_DIR)

CLANG_FLAGS	+= --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE))

GCC_TOOLCHAIN	:= $(realpath $(GCC_TOOLCHAIN_DIR)/..)

endif

ifneq ($(GCC_TOOLCHAIN),)

arch/arm64/boot/dts/qcom/qcs605-lc-ipcamera-base.dts

+3 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018, 2021 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -18,5 +18,6 @@ 
/ {

	model = "Qualcomm Technologies, Inc. QCS605 LC SoC Ipcam base";

	compatible = "qcom,qcs605";

	qcom,board-id = <0 4>;

	qcom,msm-id = <347 0x0>;

	qcom,board-id = <8 6>;

};

arch/arm64/boot/dts/qcom/qcs605-lc-ipcamera-overlay.dts

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018, 2021 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -26,5 +26,5 @@ 
	model = "Qualcomm Technologies, Inc. QC605 LC Groot + PM8005 IPC";

	compatible = "qcom,qcs605-mtp", "qcom,qcs605", "qcom,mtp";

	qcom,msm-id = <347 0x0>;

	qcom,board-id = <0x020208 4>;

	qcom,board-id = <8 6>;

};