[git pull] drm tree for 4.2
On 26 June 2015 at 18:05, Christian König wrote: > Hey Dave, > > I'm not 100% sure, but didn't you wanted to send this pull request out for > drm-next-merged instead of drm-next? > > Cause I'm still getting merge conflicts when I try to merge 4.1 into > drm-next. No generally Linus likes to do his own merges with hints from us. unless it's really tricky. Dave.
[PATCH] gpu/drm/amdgpu: Fix build when CONFIG_DEBUG_FS is not set
If the CONFIG_DEBUG_FS is not selected, compilation of the
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c provides two warnings that
amdgpu_debugfs_regs_init and amdgpu_debugfs_regs_cleanup are used but
never defined. And as result:
ERROR: "amdgpu_debugfs_regs_cleanup" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko]
undefined!
ERROR: "amdgpu_debugfs_regs_init" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko]
undefined!
^
Signed-off-by: Alexander Kuleshov
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index fec487d..6896798 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2000,5 +2000,10 @@ int amdgpu_debugfs_init(struct drm_minor *minor)
void amdgpu_debugfs_cleanup(struct drm_minor *minor)
{
}
+#else
+static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev)
+{
+ return 0;
+}
+static void amdgpu_debugfs_regs_cleanup(struct amdgpu_device *adev) { }
#endif
--
2.4.4.410.gc71d752
[Bug 61529] [r600g][kms][ATI RV710] r600_pcie_gart_tlb_flush+0xf5/0x110
https://bugs.freedesktop.org/show_bug.cgi?id=61529 --- Comment #1 from Thaddäus Tintenfisch --- A commit in 3.17-rc6 is causing this kernel panic to occur when switching off the dedicated GPU for the first time after booting the system. This is still reproducible with 4.1-rcX and radeon.runpm=0 (plus radeon.dpm=0). -- You are receiving this mail because: You are the assignee for the bug. -- next part -- An HTML attachment was scrubbed... URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20150627/c25795b1/attachment.html>
[Bug 100541] Since 4.1, the mouse cursor is corrupted after suspend/resume
https://bugzilla.kernel.org/show_bug.cgi?id=100541 --- Comment #2 from Christian Casteyde --- It was only a kernel update. I bisected it: b9729b17a414f99c61f4db9ac9f9ed987fa0cbfe is the first bad commit commit b9729b17a414f99c61f4db9ac9f9ed987fa0cbfe Author: Maarten Lankhorst Date: Tue Jan 13 09:40:13 2015 +0100 drm/radeon: dont switch vt on suspend Signed-off-by: Maarten Lankhorst Acked-by: Alex Deucher Signed-off-by: Alex Deucher :04 04 bb58e32095a1ba5289a312ba268b57240e650202 25504b41de1c9d707ce3c1288c589fd3bd2e4db0 M drivers git bisect start # good: [39a8804455fb23f09157341d3ba7db6d7ae6ee76] Linux 4.0 git bisect good 39a8804455fb23f09157341d3ba7db6d7ae6ee76 # bad: [b953c0d234bc72e8489d3bf51a276c5c4ec85345] Linux 4.1 git bisect bad b953c0d234bc72e8489d3bf51a276c5c4ec85345 # good: [d0a3997c0c3f9351e24029349dee65dd1d9e8d84] Merge tag 'sound-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound git bisect good d0a3997c0c3f9351e24029349dee65dd1d9e8d84 # bad: [cf82f52d3619d2e15c83ec9a03c6ce8cdf6c6b58] watchdog: stmp3xxx_rtc_wdt: fix broken email address git bisect bad cf82f52d3619d2e15c83ec9a03c6ce8cdf6c6b58 # good: [79319a052cb0ae862954fe9f6e606417f1698ddb] Merge tag 'iommu-updates-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu git bisect good 79319a052cb0ae862954fe9f6e606417f1698ddb # bad: [8f443e2372ba23d51ee365974f54507acd6f69d1] Revert "ocfs2: incorrect check for debugfs returns" git bisect bad 8f443e2372ba23d51ee365974f54507acd6f69d1 # good: [3165c074175cddab1dcfd553042ea4f363bc76e7] drm/i915: Use atomic state in intel_ddi_crtc_get_new_encoder() git bisect good 3165c074175cddab1dcfd553042ea4f363bc76e7 # bad: [a08aad54be7fca595af2cc7f482961e1af99c4a8] Merge tag 'drm/panel/for-4.1-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next git bisect bad a08aad54be7fca595af2cc7f482961e1af99c4a8 # bad: [9e87e48f8e5de2146842fd0ff436e0256b52c4a9] Merge tag 'drm-intel-next-2015-03-27-merge' of git://anongit.freedesktop.org/drm-intel into drm-next git bisect bad 9e87e48f8e5de2146842fd0ff436e0256b52c4a9 # bad: [87f5942d1f7bc320a0ec70ac4a8a3396024c7091] drm/dp_mst: add a function to retrieve vcpi slots git bisect bad 87f5942d1f7bc320a0ec70ac4a8a3396024c7091 # bad: [b9729b17a414f99c61f4db9ac9f9ed987fa0cbfe] drm/radeon: dont switch vt on suspend git bisect bad b9729b17a414f99c61f4db9ac9f9ed987fa0cbfe # good: [f98bd3eff592fa708bb260cf3c6403e443cd40b7] drm: Fix some typo mistake of the annotations git bisect good f98bd3eff592fa708bb260cf3c6403e443cd40b7 # good: [1067219b27e29e925e7bdbb85b72c4c2bec0267e] drm/rockchip: vop: power off until vop standby take effect git bisect good 1067219b27e29e925e7bdbb85b72c4c2bec0267e # good: [6b94aea01d4f96235e947892f6c39f837045e741] Merge branch 'drm_next' of https://github.com/markyzq/kernel-drm-rockchip into drm-next git bisect good 6b94aea01d4f96235e947892f6c39f837045e741 # good: [643b1f5629a30f979e2da678ecf0b1855e074a8c] drm/radeon: implement output csc property for DCE5+ git bisect good 643b1f5629a30f979e2da678ecf0b1855e074a8c # good: [a1dcc2778b682361351a369652b66dd2d66cf1d9] drm/radeon: setup quantization_range in AVI infoframe git bisect good a1dcc2778b682361351a369652b66dd2d66cf1d9 # first bad commit: [b9729b17a414f99c61f4db9ac9f9ed987fa0cbfe] drm/radeon: dont switch vt on suspend -- You are receiving this mail because: You are watching the assignee of the bug.
[Bug 61529] [r600g][kms][ATI RV710] r600_pcie_gart_tlb_flush+0xf5/0x110
https://bugs.freedesktop.org/show_bug.cgi?id=61529 Thaddaeus Tintenfisch changed: What|Removed |Added Severity|normal |major -- You are receiving this mail because: You are the assignee for the bug. -- next part -- An HTML attachment was scrubbed... URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20150627/c2e42bc4/attachment.html>
[PATCH] drm/bridge: ps8622: Delete a check before backlight_device_unregister()
From: Markus Elfring
Date: Sat, 27 Jun 2015 20:44:49 +0200
The backlight_device_unregister() function tests whether its argument is NULL
and then returns immediately. Thus the test around the call is not needed.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring
---
drivers/gpu/drm/bridge/ps8622.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/bridge/ps8622.c b/drivers/gpu/drm/bridge/ps8622.c
index 1a6607b..70dacb8 100644
--- a/drivers/gpu/drm/bridge/ps8622.c
+++ b/drivers/gpu/drm/bridge/ps8622.c
@@ -646,9 +646,7 @@ static int ps8622_remove(struct i2c_client *client)
{
struct ps8622_bridge *ps8622 = i2c_get_clientdata(client);
- if (ps8622->bl)
- backlight_device_unregister(ps8622->bl);
-
+ backlight_device_unregister(ps8622->bl);
drm_bridge_remove(&ps8622->bridge);
return 0;
--
2.4.4
[PATCH 1/2] drm/msm/dsi: Delete an unnecessary check before the function call "dsi_destroy"
From: Markus Elfring Date: Sat, 27 Jun 2015 22:05:31 +0200 The dsi_destroy() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/gpu/drm/msm/dsi/dsi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 1f2561e..dc4f38f 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -110,9 +110,7 @@ static struct msm_dsi *dsi_init(struct platform_device *pdev) return msm_dsi; fail: - if (msm_dsi) - dsi_destroy(msm_dsi); - + dsi_destroy(msm_dsi); return ERR_PTR(ret); } -- 2.4.4
[PATCH] GPU-DRM-Exynos: Delete unnecessary checks before two function calls
>> From: Markus Elfring
>> Date: Wed, 4 Feb 2015 21:54:45 +0100
>>
>> The functions phy_power_on() and vunmap() perform also input
>> parameter validation. Thus the test around their calls is not needed.
>>
>> This issue was detected by using the Coccinelle software.
>>
>> Signed-off-by: Markus Elfring
>> ---
>> drivers/gpu/drm/exynos/exynos_dp_core.c | 6 ++
>> drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 2 +-
>> 2 files changed, 3 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/exynos/exynos_dp_core.c
>> b/drivers/gpu/drm/exynos/exynos_dp_core.c
>> index 34d46aa..306cf1d 100644
>> --- a/drivers/gpu/drm/exynos/exynos_dp_core.c
>> +++ b/drivers/gpu/drm/exynos/exynos_dp_core.c
>> @@ -1057,14 +1057,12 @@ static int exynos_dp_create_connector(struct
>> exynos_drm_display *display,
>>
>> static void exynos_dp_phy_init(struct exynos_dp_device *dp)
>> {
>> -if (dp->phy)
>> -phy_power_on(dp->phy);
>> +phy_power_on(dp->phy);
>> }
>>
>> static void exynos_dp_phy_exit(struct exynos_dp_device *dp)
>> {
>> -if (dp->phy)
>> -phy_power_off(dp->phy);
>> +phy_power_off(dp->phy);
>> }
>>
>> static void exynos_dp_poweron(struct exynos_drm_display *display)
>> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
>> b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
>> index e12ea90..0dd448a 100644
>> --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
>> +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
>> @@ -313,7 +313,7 @@ static void exynos_drm_fbdev_destroy(struct drm_device
>> *dev,
>> struct exynos_drm_gem_obj *exynos_gem_obj = exynos_fbd->exynos_gem_obj;
>> struct drm_framebuffer *fb;
>>
>> -if (is_drm_iommu_supported(dev) && exynos_gem_obj->buffer->kvaddr)
>> +if (is_drm_iommu_supported(dev))
>> vunmap(exynos_gem_obj->buffer->kvaddr);
>>
>> /* release drm framebuffer and real buffer */
>>
>
> Acked-by: Joonyoung Shim
Do the chances increase to integrate this update suggestion
into another source code repository?
Regards,
Markus
[PATCH 0/2] drm/msm/dsi: Deletion of an unnecessary check
From: Markus Elfring Further update suggestions were taken into account after a patch was applied from static source code analysis. Markus Elfring (2): Delete an unnecessary check before the function call "dsi_destroy" One function call less in dsi_init() after error detection drivers/gpu/drm/msm/dsi/dsi.c | 26 ++ 1 file changed, 10 insertions(+), 16 deletions(-) -- 2.4.4
[PATCH 2/2] drm/msm/dsi: One function call less in dsi_init() after error detection
From: Markus Elfring
Date: Sat, 27 Jun 2015 22:23:28 +0200
The dsi_destroy() function was called in two cases by the dsi_init() function
during error handling even if the passed variable contained a null pointer.
* This implementation detail could be improved by adjustments for jump
targets according to the Linux coding style convention.
* Drop an unnecessary initialisation for the variable "msm_dsi" then.
Signed-off-by: Markus Elfring
---
drivers/gpu/drm/msm/dsi/dsi.c | 22 +-
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c
index dc4f38f..971f000 100644
--- a/drivers/gpu/drm/msm/dsi/dsi.c
+++ b/drivers/gpu/drm/msm/dsi/dsi.c
@@ -74,19 +74,15 @@ static void dsi_destroy(struct msm_dsi *msm_dsi)
static struct msm_dsi *dsi_init(struct platform_device *pdev)
{
- struct msm_dsi *msm_dsi = NULL;
+ struct msm_dsi *msm_dsi;
int ret;
- if (!pdev) {
- ret = -ENXIO;
- goto fail;
- }
+ if (!pdev)
+ return -ENXIO;
msm_dsi = devm_kzalloc(&pdev->dev, sizeof(*msm_dsi), GFP_KERNEL);
- if (!msm_dsi) {
- ret = -ENOMEM;
- goto fail;
- }
+ if (!msm_dsi)
+ return -ENOMEM;
DBG("dsi probed=%p", msm_dsi);
msm_dsi->pdev = pdev;
@@ -95,21 +91,21 @@ static struct msm_dsi *dsi_init(struct platform_device
*pdev)
/* Init dsi host */
ret = msm_dsi_host_init(msm_dsi);
if (ret)
- goto fail;
+ goto destroy_dsi;
/* GET dsi PHY */
ret = dsi_get_phy(msm_dsi);
if (ret)
- goto fail;
+ goto destroy_dsi;
/* Register to dsi manager */
ret = msm_dsi_manager_register(msm_dsi);
if (ret)
- goto fail;
+ goto destroy_dsi;
return msm_dsi;
-fail:
+destroy_dsi:
dsi_destroy(msm_dsi);
return ERR_PTR(ret);
}
--
2.4.4
