[PULL] drm-intel-next-fixes
Hi Dave and Daniel, A few fixes for the merge window. One dealing with runtime PM handling on the PXP unbind path and a few regarding the newly added TTM backend support. Regards, Tvrtko --- drm-intel-next-fixes-2022-01-13: - Hold runtime PM wakelock during PXP unbind (Juston Li) - Three fixes for the TTM backend fault handling (Matthew Auld) - Make sure to unmap when purging in the TTM backend (Matthew Auld) The following changes since commit c65fe9cbbfd61dbc12868f9ed4940c80fcb249e8: drm/i915/fbc: Remember to update FBC state even when not reallocating CFB (2021-12-27 11:46:48 +0200) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-next-fixes-2022-01-13 for you to fetch changes up to 6ef295e34297433c78ea02dfcf1c649a769050bb: drm/i915/ttm: ensure we unmap when purging (2022-01-10 14:00:47 +) - Hold runtime PM wakelock during PXP unbind (Juston Li) - Three fixes for the TTM backend fault handling (Matthew Auld) - Make sure to unmap when purging in the TTM backend (Matthew Auld) Juston Li (1): drm/i915/pxp: Hold RPM wakelock during PXP unbind Matthew Auld (4): drm/i915: don't call free_mmap_offset when purging drm/i915/ttm: only fault WILLNEED objects drm/i915/ttm: add unmap_virtual callback drm/i915/ttm: ensure we unmap when purging drivers/gpu/drm/i915/gem/i915_gem_mman.c | 3 +++ drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 1 + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 1 - drivers/gpu/drm/i915/gem/i915_gem_ttm.c| 27 +- drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 18 --- drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 5 +++- 6 files changed, 38 insertions(+), 17 deletions(-)
[PATCH 3/4] dim: Move timestamp file to XDG_CACHE_HOME
XDG_CACHE_HOME is meant to hold "user-specific, non-essential data"
which seems like a good fit and avoids bloating ~.
Signed-off-by: Maxime Ripard
---
dim | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dim b/dim
index f098b14b4da1..a5aa182b2e24 100755
--- a/dim
+++ b/dim
@@ -408,12 +408,13 @@ function check_for_updates
{
local stamp stampfile
- stampfile=$HOME/.dim-update-check-timestamp
+ stampfile=$DIM_CACHE_DIR/update-check-timestamp
# daily check for updates based on file timestamp
stamp=$(stat --printf=%Y $stampfile 2>/dev/null || echo -n 0)
if [[ $((stamp + 24*60*60)) -lt $(date +%s) ]]; then
dim_uptodate || true
+ mkdir -p $(dirname $stampfile)
touch $stampfile
fi
}
--
2.34.1
[PATCH 4/4] dim: Introduce a new configuration file in .config/dim
The dim configuration has been stored in ~/.dimrc so far, but using
XDG_CONFIG_HOME allows for a tidier home directory.
Introduce a new XDG_CONFIG_HOME/dim/dimrc path.
Signed-off-by: Maxime Ripard
---
dim | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/dim b/dim
index a5aa182b2e24..0488d7666185 100755
--- a/dim
+++ b/dim
@@ -36,12 +36,18 @@ set -e
#
DIM_CACHE_DIR=${XDG_CACHE_HOME:-$HOME/.cache}/dim
+DIM_CONF_DIR=${XDG_CONFIG_HOME:-$HOME/.config}/dim
# dim configuration file
-DIM_CONFIG=${DIM_CONFIG:-$HOME/.dimrc}
-if [ -r $DIM_CONFIG ]; then
+if [[ -n $DIM_CONFIG ]] && [ -r $DIM_CONFIG ]; then
# shellcheck source=/dev/null
. $DIM_CONFIG
+elif [ -r $DIM_CONF_DIR/dimrc ]; then
+ # shellcheck source=/dev/null
+ . $DIM_CONF_DIR/dimrc
+else
+ # shellcheck source=/dev/null
+ . $HOME/.dimrc
fi
# prefix for repo directories
--
2.34.1
[PATCH 2/4] dim: Move last-path file to XDG_CACHE_HOME
XDG_CACHE_HOME is meant to hold "user-specific, non-essential data"
which seems like a good fit and avoids bloating ~.
Signed-off-by: Maxime Ripard
---
bash_completion | 4 +++-
dim | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/bash_completion b/bash_completion
index 764993ba7472..aea1947f4be8 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1,6 +1,8 @@
#! /bin/bash
-dim_last_path_file=~/.dim-last-path
+DIM_CACHE_DIR=${XDG_CACHE_HOME:-$HOME/.cache}/dim
+
+dim_last_path_file=$DIM_CACHE_DIR/last-path
dim ()
{
diff --git a/dim b/dim
index 865b2cb161b7..f098b14b4da1 100755
--- a/dim
+++ b/dim
@@ -35,6 +35,8 @@ set -e
# environment or configuration file. See dimrc.sample for an example.
#
+DIM_CACHE_DIR=${XDG_CACHE_HOME:-$HOME/.cache}/dim
+
# dim configuration file
DIM_CONFIG=${DIM_CONFIG:-$HOME/.dimrc}
if [ -r $DIM_CONFIG ]; then
@@ -102,7 +104,7 @@ dim_pull_request_recipients=(
# integration configuration
dim_integration_config=nightly.conf
-dim_last_path_file=~/.dim-last-path
+dim_last_path_file=$DIM_CACHE_DIR/last-path
dim_extract_tags_marker="# *** extracted tags ***"
--
2.34.1
[PATCH 1/4] dim: Move dim-last-path path definition to a variable
The code has multiple places where the .dim-last-path file is
referenced, so let's move it to a variable.
Signed-off-by: Maxime Ripard
---
bash_completion | 4 +++-
dim | 6 --
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/bash_completion b/bash_completion
index e88aa4f98f2d..764993ba7472 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1,9 +1,11 @@
#! /bin/bash
+dim_last_path_file=~/.dim-last-path
+
dim ()
{
if [[ "$1" = "cd" ]]; then
- cd $(cat ~/.dim-last-path) || exit
+ cd $(cat $dim_last_path_file) || exit
else
command dim "$@"
fi
diff --git a/dim b/dim
index bbe9308ac695..865b2cb161b7 100755
--- a/dim
+++ b/dim
@@ -102,6 +102,8 @@ dim_pull_request_recipients=(
# integration configuration
dim_integration_config=nightly.conf
+dim_last_path_file=~/.dim-last-path
+
dim_extract_tags_marker="# *** extracted tags ***"
#
@@ -1516,7 +1518,7 @@ function dim_magic_patch
local conflict_files
if [[ "$1" = "-a" ]]; then
- cd $(cat ~/.dim-last-path)
+ cd $(cat $dim_last_path_file)
fi
conflict_files=$(patch -p1 | grep "saving rejects" | sed -e "s/.*saving
rejects to file \(.*\)/\1/")
@@ -1617,7 +1619,7 @@ function dim_cd
path=$DIM_PREFIX/$DIM_REPO
fi
- echo $path > ~/.dim-last-path
+ echo $path > $dim_last_path_file
cd $path
}
--
2.34.1
[PULL] drm-misc-next-fixes
Hi Dave and Daniel, here's this week's PR for drm-misc-next-fixes. Best regards Thomas drm-misc-next-fixes-2022-01-13: * Fix use of CRTC state's active vs enable in atomic helper The following changes since commit 5da8b49de472c1da8658466d4f63ef8d9251a819: dt-bindings: display: bridge: lvds-codec: Fix duplicate key (2021-12-22 14:02:04 -0400) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2022-01-13 for you to fetch changes up to 69e630016ef4e4a1745310c446f204dc6243e907: drm/atomic: Check new_crtc_state->active to determine if CRTC needs disable in self refresh mode (2022-01-11 10:37:15 -0500) * Fix use of CRTC state's active vs enable in atomic helper Liu Ying (1): drm/atomic: Check new_crtc_state->active to determine if CRTC needs disable in self refresh mode drivers/gpu/drm/drm_atomic_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
