date:20171026

[PATCH] drm/amd/display: check if modeset is required before adding plane

2017-10-26 Thread S, Shirish


From: Shirish S 

Adding affected planes without checking if modeset is requested from the user 
space causes performance regression in video p/b scenarios when full screen p/b 
is not composited.

Hence add a check before adding a plane as affected.

bug: https://bugs.freedesktop.org/show_bug.cgi?id=103408

Signed-off-by: Shirish S 
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index f0b50d9..e6ec130 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -4727,6 +4727,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
}
} else {
for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, 
new_crtc_state, i) {
+   if (!drm_atomic_crtc_needs_modeset(new_crtc_state))
+   continue;
+
if (!new_crtc_state->enable)
continue;
 
--
2.7.4

___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 00/29] DC Linux Patches Oct 25, 2017

2017-10-26 Thread Andrey Grodzovsky


Patches 1,2,6,24-26,28 are

Reviewed-by: Andrey Grodzovsky


On 2017-10-26 02:34 PM, Harry Wentland wrote:

  * Remove annoyning Freesync warning
  * Fix Freesync and amd-stg which was broken in last set of patches
  * Fix issue with plugging in displays during S3
  * Bunch of generic fixes found during Raven bringup
  * Whole bunch of Raven fixes and work

Andrew Jiang (3):
   drm/amd/display: Reject PPLib clock values if they are invalid
   drm/amd/display: Use constants from atom.h for HDMI caps read
   drm/amd/display: Don't reject 3D timings

Anthony Koo (1):
   drm/amd/display: Move hdr_metadata from plane to stream

Charlene Liu (1):
   drm/amd/display: correct DP is always in full range or bt609

Dmytro Laktyushkin (2):
   drm/amd/display: fix split recout calculation
   drm/amd/display: fix split recout offset

Eric Yang (1):
   drm/amd/display: Add timing validation against dongle cap

Harry Wentland (7):
   drm/amdgpu: Remove immutable flag from freesync_capable property
   drm/amd/display: Move conn_state to header
   drm/amd/display: Use plane pointer to avoid line breaks
   drm/amd/display: Use single fail label in init_drm_dev
   drm/amd/display: Explicitly call ->reset for each object
   drm/amd/display: Don't access legacy properties
   drm/amd/display: Fix Freesync enablement

Hersen Wu (1):
   drm/amd/display: Handle as MST first and then DP dongle if sink
 support both

Leo (Sunpeng) Li (2):
   drm/amd/display: Fix styling of freesync code in commit_tail
   drm/amd/display: Complete TODO item: use new DRM iterator

Roman Li (1):
   drm/amd/display: Fix S3 topology change

SivapiriyanKumarasamy (1):
   drm/amd/display: Apply VQ adjustments in MPO case

Tony Cheng (3):
   drm/amd/display: dal 3.1.08
   drm/amd/display: dal 3.1.09
   drm/amd/display: dal 3.1.10

Yongqiang Sun (3):
   drm/amd/display: Power down front end in init_hw.
   drm/amd/display: Not reset front end when program back end.
   drm/amd/display: Added disconnect dchub.

Yue Hin Lau (3):
   drm/amd/display: create new files for hubbub functions
   drm/amd/display: create new structure for hubbub
   drm/amd/display: fix bug from last commit for hubbub

  drivers/gpu/drm/amd/amdgpu/amdgpu_display.c|   2 +-
  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  | 198 ++---
  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h  |  13 +
  drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c   |  68 +-
  drivers/gpu/drm/amd/display/dc/core/dc.c   |  23 +-
  drivers/gpu/drm/amd/display/dc/core/dc_debug.c |   4 +
  drivers/gpu/drm/amd/display/dc/core/dc_link.c  | 108 ++-
  drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   |  21 +-
  drivers/gpu/drm/amd/display/dc/core/dc_resource.c  |  51 +-
  drivers/gpu/drm/amd/display/dc/dc.h|  44 +-
  drivers/gpu/drm/amd/display/dc/dc_hw_types.h   |   9 +
  drivers/gpu/drm/amd/display/dc/dc_types.h  |   5 -
  .../drm/amd/display/dc/dce/dce_stream_encoder.c|  34 +-
  .../amd/display/dc/dce110/dce110_hw_sequencer.c|   3 +-
  drivers/gpu/drm/amd/display/dc/dcn10/Makefile  |   3 +-
  drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c   |  31 +-
  drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h   |  47 +-
  .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c|  44 +-
  .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c| 510 +
  .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h| 217 ++
  drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c  |   9 +
  .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c  | 841 +
  .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h  |   1 +
  .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c  |  44 ++
  .../amd/display/dc/dcn10/dcn10_timing_generator.c  |   3 -
  drivers/gpu/drm/amd/display/dc/inc/core_status.h   |   2 +-
  drivers/gpu/drm/amd/display/dc/inc/core_types.h|   1 +
  drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h|  10 +-
  drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h   |   2 +
  drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h  |  14 +
  drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h|   6 +-
  drivers/gpu/drm/amd/display/dc/inc/hw/transform.h  |   6 +-
  32 files changed, 1468 insertions(+), 906 deletions(-)
  create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c
  create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h



___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 03/29] drm/amd/display: Complete TODO item: use new DRM iterator

2017-10-26 Thread Andrey Grodzovsky




On 2017-10-26 02:34 PM, Harry Wentland wrote:

From: "Leo (Sunpeng) Li" 

Abandon new_crtcs array and use for_each_new iterator to acquire new
crtcs.

Signed-off-by: Leo (Sunpeng) Li 
Reviewed-by: Harry Wentland 
---
  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 36 +--
  1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 442b399a9400..590f80d29b56 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -4013,10 +4013,8 @@ static void amdgpu_dm_atomic_commit_tail(struct 
drm_atomic_state *state)
struct amdgpu_display_manager *dm = >dm;
struct dm_atomic_state *dm_state;
uint32_t i, j;
-   uint32_t new_crtcs_count = 0;
struct drm_crtc *crtc;
struct drm_crtc_state *old_crtc_state, *new_crtc_state;
-   struct amdgpu_crtc *new_crtcs[MAX_STREAMS];
unsigned long flags;
bool wait_for_vblank = true;
struct drm_connector *connector;
@@ -4075,25 +4073,9 @@ static void amdgpu_dm_atomic_commit_tail(struct 
drm_atomic_state *state)
continue;
}
  
-

if (dm_old_crtc_state->stream)
remove_stream(adev, acrtc, 
dm_old_crtc_state->stream);
  
-

-   /*
-* this loop saves set mode crtcs
-* we needed to enable vblanks once all
-* resources acquired in dc after dc_commit_streams
-*/
-
-   /*TODO move all this into dm_crtc_state, get rid of
-* new_crtcs array and use old and new atomic states
-* instead
-*/
-   new_crtcs[new_crtcs_count] = acrtc;
-   new_crtcs_count++;
-
-   new_crtc_state = drm_atomic_get_new_crtc_state(state, 
crtc);
acrtc->enabled = true;
acrtc->hw_mode = new_crtc_state->mode;
crtc->hwmode = new_crtc_state->mode;
@@ -4221,18 +4203,28 @@ static void amdgpu_dm_atomic_commit_tail(struct 
drm_atomic_state *state)
dm_error("%s: Failed to update stream scaling!\n", 
__func__);
}
  
-	for (i = 0; i < new_crtcs_count; i++) {

+   for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state,
+   new_crtc_state, i) {
/*
 * loop to enable interrupts on newly arrived crtc
 */
-   struct amdgpu_crtc *acrtc = new_crtcs[i];
+   struct amdgpu_crtc *acrtc = to_amdgpu_crtc(crtc);
+   bool modeset_needed;
  
-		new_crtc_state = drm_atomic_get_new_crtc_state(state, >base);

dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);
+   dm_old_crtc_state = to_dm_crtc_state(old_crtc_state);
+   modeset_needed = modeset_required(
+   new_crtc_state,
+   dm_new_crtc_state->stream,
+   dm_old_crtc_state->stream);
+
+   if (dm_new_crtc_state->stream == NULL || !modeset_needed)
+   continue;


I feel it's a bit future bug prone to repeat the 2 checks above from the 
initial
for_each_crtc_in_state loop, somebody makes changes there and forget 
about this loop.

The array is ugly but it avoids logic duplication.

Thanks,
Andrey

  
  		if (adev->dm.freesync_module)

mod_freesync_notify_mode_change(
-   adev->dm.freesync_module, 
_new_crtc_state->stream, 1);
+   adev->dm.freesync_module,
+   _new_crtc_state->stream, 1);
  
  		manage_dm_interrupts(adev, acrtc, true);

}


___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 27/29] drm/amd/display: Explicitly call ->reset for each object

2017-10-26 Thread Andrey Grodzovsky




On 2017-10-26 02:35 PM, Harry Wentland wrote:

We need to avoid calling reset after detection.


Could you explain why please ?


This is much simpler
if we call ->reset on the connector right after creation but before
detection. To stay consistent call ->reset on every other object
as well after creation.

Signed-off-by: Harry Wentland 
Reviewed-by: Roman Li 
Acked-by: Harry Wentland 
---
  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 --
  1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 6fc043957bbf..62e8db1f113c 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1436,8 +1436,6 @@ static int amdgpu_dm_initialize_drm_device(struct 
amdgpu_device *adev)
goto fail;
}
  
-	drm_mode_config_reset(dm->ddev);


This is a standard helper called by many drivers on driver init , it's 
also called in drm_atomic_helper_resume
which we use on resume from suspend so now it's kind of asymmetrical 
behavior.


Thanks,
Andrey


-
return 0;
  fail:
kfree(aencoder);
@@ -3105,6 +3103,11 @@ static int amdgpu_dm_plane_init(struct 
amdgpu_display_manager *dm,
  
  	drm_plane_helper_add(>base, _plane_helper_funcs);
  
+	/* Create (reset) the plane state */

+   if (aplane->base.funcs->reset)
+   aplane->base.funcs->reset(>base);
+
+
return res;
  }
  
@@ -3140,6 +3143,10 @@ static int amdgpu_dm_crtc_init(struct amdgpu_display_manager *dm,
  
  	drm_crtc_helper_add(>base, _dm_crtc_helper_funcs);
  
+	/* Create (reset) the plane state */

+   if (acrtc->base.funcs->reset)
+   acrtc->base.funcs->reset(>base);
+
acrtc->max_cursor_width = dm->adev->dm.dc->caps.max_cursor_size;
acrtc->max_cursor_height = dm->adev->dm.dc->caps.max_cursor_size;
  
@@ -3500,6 +3507,9 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,

>base,
_dm_connector_helper_funcs);
  
+	if (aconnector->base.funcs->reset)

+   aconnector->base.funcs->reset(>base);
+
amdgpu_dm_connector_init_helper(
dm,
aconnector,


___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [pull] amdgpu dc drm-next-4.15-dc

2017-10-26 Thread Dieter Nützel

Am 26.10.2017 19:26, schrieb Alex Deucher:
On Thu, Oct 26, 2017 at 10:10 AM, Dieter Nützel
wrote:

Hello Alex & Rex,

any progress?
The 'screen blank' (monitor standby mode) is really annoying.

Does this patch help?
https://cgit.freedesktop.org/~agd5f/linux/commit/?h=amd-staging-drm-next=ddabbf65aae36e21b4c79354940f80eae6c36104

Alex

Yes, it seems so. Many thanks to Jerry for this fix.
I've tested it with latest amd-staging-drm-next #4ce527eb8bb3 on my
Polaris 20. Both cases (kdm_greet and 'screen blank') are solved. W'll
apply it on drm-next-4.15-dc, too.

Side note:
HDMI audio is _gone_ after logout and relogin.
Missing reinitialization?

Next:
Fix fan speed...

Thank you very much!
Dieter

Thanks,
Dieter

Am 23.10.2017 03:03, schrieb Dieter Nützel:

Am 22.10.2017 23:48, schrieb Dieter Nützel:

Am 21.10.2017 23:22, schrieb Alex Deucher:

Hi Dave,

Last batch of new stuff for DC. Highlights:
- Fix some memory leaks
- S3 fixes
- Hotplug fixes
- Fix some CX multi-display issues
- MST fixes
- DML updates from the hw team
- Various code cleanups
- Misc bug fixes

Now this tree has the same fan regression as 'amd-staging-drm-next'
startet with 0944c350c8eddf4064e7abb881dd245032fdfa23.

Look here:
[amd-staging-drm-next] regression - no fan info (sensors) on RX580
https://lists.freedesktop.org/archives/amd-gfx/2017-October/014065.html

Second:
KDE's greeter 'kdm_greet' (login screen went into dpms) and KDE's
'screen blank' (energy saving / dpms off) never came back. All I can
do is a clean reboot. So I have to disable all 'dpms'.
But I could attach gdb remotely on it.
'kdm_greet' hang in 'poll'.
Nothing alarming in 'dmesg' and 'Xorg.0.log'. (Both available taken
from 'amd-staging-drm-next' if needed).

Hello Alex and Rex,

I've found good hint from Jan (randomsalad) on phoronix for the
'screen blank' (monitor standby mode):

https://www.phoronix.com/forums/forum/phoronix/latest-phoronix-articles/984483-amdgpu-dc-gets-a-final-batch-of-changes-before-linux-4-15?p=984555#post984555

My Reply:

https://www.phoronix.com/forums/forum/phoronix/latest-phoronix-articles/984483-amdgpu-dc-gets-a-final-batch-of-changes-before-linux-4-15?p=984581#post984581

I can swear, that I could 'return' one time (the first time, maybe
due

to only warm reboot) on 'drm-next-4.15-dc-wip' directly from within
KDE session with replugging the video cable, but for all later tests
on both kernels I have to blindly switching back to login screen
(kdm_greet) and then replugging the video cable.

For me these regression started with 'amd-staging-drm-next' much
earlier than with the latest commit.

Dieter
___
dri-devel mailing list
dri-de...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH libdrm 2/2] amdgpu: Add VMID reservation per GPU context test.

2017-10-26 Thread Andrey Grodzovsky

The test will Reserve a VMID, submit a command and
unreserve the VMID.

Change-Id: I2e5320b2c3044d1375bc5b18d936d3c0637f5daa
Signed-off-by: Andrey Grodzovsky 
---
 tests/amdgpu/Makefile.am   |   3 +-
 tests/amdgpu/amdgpu_test.c |   7 +++
 tests/amdgpu/amdgpu_test.h |  15 +
 tests/amdgpu/vm_tests.c| 151 +
 4 files changed, 175 insertions(+), 1 deletion(-)
 create mode 100644 tests/amdgpu/vm_tests.c

diff --git a/tests/amdgpu/Makefile.am b/tests/amdgpu/Makefile.am
index 8700c4d..e79c1bd 100644
--- a/tests/amdgpu/Makefile.am
+++ b/tests/amdgpu/Makefile.am
@@ -31,4 +31,5 @@ amdgpu_test_SOURCES = \
uvd_enc_tests.c \
vcn_tests.c \
uve_ib.h \
-   deadlock_tests.c
+   deadlock_tests.c \
+   vm_tests.c
diff --git a/tests/amdgpu/amdgpu_test.c b/tests/amdgpu/amdgpu_test.c
index 9925503..a82d9ab 100644
--- a/tests/amdgpu/amdgpu_test.c
+++ b/tests/amdgpu/amdgpu_test.c
@@ -103,6 +103,13 @@ static CU_SuiteInfo suites[] = {
.pCleanupFunc = suite_deadlock_tests_clean,
.pTests = deadlock_tests,
},
+   {
+   .pName = "VM Tests",
+   .pInitFunc = suite_vm_tests_init,
+   .pCleanupFunc = suite_vm_tests_clean,
+   .pTests = vm_tests,
+   },
+
CU_SUITE_INFO_NULL,
 };
 
diff --git a/tests/amdgpu/amdgpu_test.h b/tests/amdgpu/amdgpu_test.h
index ece93f4..4fffbc6 100644
--- a/tests/amdgpu/amdgpu_test.h
+++ b/tests/amdgpu/amdgpu_test.h
@@ -150,6 +150,21 @@ int suite_deadlock_tests_clean();
 extern CU_TestInfo deadlock_tests[];
 
 /**
+ * Initialize vm test suite
+ */
+int suite_vm_tests_init();
+
+/**
+ * Deinitialize deadlock test suite
+ */
+int suite_vm_tests_clean();
+
+/**
+ * Tests in vm test suite
+ */
+extern CU_TestInfo vm_tests[];
+
+/**
  * Helper functions
  */
 static inline amdgpu_bo_handle gpu_mem_alloc(
diff --git a/tests/amdgpu/vm_tests.c b/tests/amdgpu/vm_tests.c
new file mode 100644
index 000..22bac37
--- /dev/null
+++ b/tests/amdgpu/vm_tests.c
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2017 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+*/
+
+#include "CUnit/Basic.h"
+
+#include "amdgpu_test.h"
+#include "amdgpu_drm.h"
+
+static  amdgpu_device_handle device_handle;
+static  uint32_t  major_version;
+static  uint32_t  minor_version;
+
+
+static void amdgpu_vmid_reserve_test(void);
+
+int suite_vm_tests_init(void)
+{
+   struct amdgpu_gpu_info gpu_info = {0};
+   int r;
+
+   r = amdgpu_device_initialize(drm_amdgpu[0], _version,
+  _version, _handle);
+
+   if (r) {
+   if ((r == -EACCES) && (errno == EACCES))
+   printf("\n\nError:%s. "
+   "Hint:Try to run this test program as root.",
+   strerror(errno));
+   return CUE_SINIT_FAILED;
+   }
+
+   return CUE_SUCCESS;
+}
+
+int suite_vm_tests_clean(void)
+{
+   int r = amdgpu_device_deinitialize(device_handle);
+
+   if (r == 0)
+   return CUE_SUCCESS;
+   else
+   return CUE_SCLEAN_FAILED;
+}
+
+
+CU_TestInfo vm_tests[] = {
+   { "resere vmid test",  amdgpu_vmid_reserve_test },
+   CU_TEST_INFO_NULL,
+};
+
+static void amdgpu_vmid_reserve_test(void)
+{
+   amdgpu_context_handle context_handle;
+   amdgpu_bo_handle ib_result_handle;
+   void *ib_result_cpu;
+   uint64_t ib_result_mc_address;
+   struct amdgpu_cs_request ibs_request;
+   struct amdgpu_cs_ib_info ib_info;
+   struct amdgpu_cs_fence fence_status;
+   uint32_t expired, flags;
+   int i, r, instance;
+   amdgpu_bo_list_handle bo_list;
+   amdgpu_va_handle va_handle;
+   union drm_amdgpu_vm vm;
+   static uint32_t *ptr;
+
+   r = amdgpu_cs_ctx_create(device_handle, _handle);
+

[PATCH libdrm 1/2] amdgpu: Add wrappers for AMDGPU_VM IOCTL.

2017-10-26 Thread Andrey Grodzovsky

Change-Id: I7eafb85c1ca96d6d255f0183bed0ce4129746fe0
Signed-off-by: Andrey Grodzovsky 
---
 amdgpu/Makefile.sources |  1 +
 amdgpu/amdgpu.h | 20 +++
 amdgpu/amdgpu_vm.c  | 52 +
 3 files changed, 73 insertions(+)
 create mode 100644 amdgpu/amdgpu_vm.c

diff --git a/amdgpu/Makefile.sources b/amdgpu/Makefile.sources
index bc3abaa..498b64c 100644
--- a/amdgpu/Makefile.sources
+++ b/amdgpu/Makefile.sources
@@ -6,6 +6,7 @@ LIBDRM_AMDGPU_FILES := \
amdgpu_gpu_info.c \
amdgpu_internal.h \
amdgpu_vamgr.c \
+   amdgpu_vm.c \
util_hash.c \
util_hash.h \
util_hash_table.c \
diff --git a/amdgpu/amdgpu.h b/amdgpu/amdgpu.h
index ecc975f..07f2851 100644
--- a/amdgpu/amdgpu.h
+++ b/amdgpu/amdgpu.h
@@ -1489,6 +1489,26 @@ void amdgpu_cs_chunk_fence_to_dep(struct amdgpu_cs_fence 
*fence,
 void amdgpu_cs_chunk_fence_info_to_data(struct amdgpu_cs_fence_info 
*fence_info,
struct drm_amdgpu_cs_chunk_data *data);
 
+/**
+ * Reserve VMID
+ * \param   context - \c [in]  GPU Context
+ * \param   flags - \c [in]  TBD
+ *
+ * \return  0 on success otherwise POSIX Error code
+*/
+int amdgpu_vm_alloc_reserved_vmid(amdgpu_context_handle context,
+ uint32_t  
flags);
+
+/**
+ * Free reserved VMID
+ * \param   context - \c [in]  GPU Context
+ * \param   flags - \c [in]  TBD
+ *
+ * \return  0 on success otherwise POSIX Error code
+*/
+int amdgpu_vm_free_reserved_vmid(amdgpu_context_handle context,
+uint32_t   
flags);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/amdgpu/amdgpu_vm.c b/amdgpu/amdgpu_vm.c
new file mode 100644
index 000..1664b7b
--- /dev/null
+++ b/amdgpu/amdgpu_vm.c
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2017 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+
+#include "amdgpu.h"
+#include "amdgpu_drm.h"
+#include "xf86drm.h"
+#include "amdgpu_internal.h"
+
+int amdgpu_vm_alloc_reserved_vmid(amdgpu_context_handle context,
+ uint32_t  
flags)
+{
+   union drm_amdgpu_vm vm;
+
+   vm.in.op = AMDGPU_VM_OP_RESERVE_VMID;
+   vm.in.flags = flags;
+
+   return drmCommandWriteRead(context->dev->fd, DRM_AMDGPU_VM,
+  , sizeof(vm));
+}
+
+int amdgpu_vm_free_reserved_vmid(amdgpu_context_handle context,
+uint32_t   
flags)
+{
+   union drm_amdgpu_vm vm;
+
+   vm.in.op = AMDGPU_VM_OP_UNRESERVE_VMID;
+   vm.in.flags = flags;
+
+   return drmCommandWriteRead(context->dev->fd, DRM_AMDGPU_VM,
+  , sizeof(vm));
+}
-- 
2.7.4

___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH 5/8] drm/amdgpu: don't use ttm_bo_move_ttm in amdgpu_ttm_bind

2017-10-26 Thread Deucher, Alexander

> -Original Message-
> From: Christian König [mailto:ckoenig.leichtzumer...@gmail.com]
> Sent: Thursday, October 26, 2017 2:39 PM
> To: Deucher, Alexander; 'Christian König'; amd-gfx@lists.freedesktop.org
> Subject: Re: [PATCH 5/8] drm/amdgpu: don't use ttm_bo_move_ttm in
> amdgpu_ttm_bind
> 
> Am 26.10.2017 um 20:11 schrieb Deucher, Alexander:
> >> -Original Message-
> >> From: amd-gfx [mailto:amd-gfx-boun...@lists.freedesktop.org] On
> Behalf
> >> Of Christian König
> >> Sent: Thursday, October 26, 2017 12:06 PM
> >> To: amd-gfx@lists.freedesktop.org
> >> Subject: [PATCH 5/8] drm/amdgpu: don't use ttm_bo_move_ttm in
> >> amdgpu_ttm_bind
> >>
> >> From: Christian König 
> >>
> >> Just unbind and rebind to force updates of the GART space.
> >>
> >> This prevents forcing the BO to be idle.
> > Is there a chance something could change like the caching on a  rebind that
> we need to account for?
> 
> Not that I could think of.
> 
> The new placement should have identical attributes to the old one, just
> with GART space allocated.

In that case,

Acked-by: Alex Deucher 

> 
> Christian.
> 
> >
> > Alex
> >
> >> Signed-off-by: Christian König 
> >> ---
> >>   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 24
> ++-
> >> -
> >>   1 file changed, 18 insertions(+), 6 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> >> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> >> index 3045701..b40d2f3 100644
> >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> >> @@ -917,14 +917,26 @@ int amdgpu_ttm_bind(struct ttm_buffer_object
> >> *bo, struct ttm_mem_reg *bo_mem)
> >>if (unlikely(r))
> >>return r;
> >>
> >> -  r = ttm_bo_move_ttm(bo, true, false, );
> >> -  if (unlikely(r))
> >> +  if (ttm->state == tt_bound) {
> >> +  r = ttm->func->unbind(ttm);
> >> +  if (unlikely(r))
> >> +  return r;
> >> +
> >> +  ttm->state = tt_unbound;
> >> +  }
> >> +
> >> +  r = ttm_tt_bind(ttm, );
> >> +  if (unlikely(r)) {
> >>ttm_bo_mem_put(bo, );
> >> -  else
> >> -  bo->offset = (bo->mem.start << PAGE_SHIFT) +
> >> -  bo->bdev->man[bo->mem.mem_type].gpu_offset;
> >> +  return r;
> >> +  }
> >>
> >> -  return r;
> >> +  ttm_bo_mem_put(bo, bo_mem);
> >> +  bo->mem = tmp;
> >> +  bo->offset = (bo->mem.start << PAGE_SHIFT) +
> >> +  bo->bdev->man[bo->mem.mem_type].gpu_offset;
> >> +
> >> +  return 0;
> >>   }
> >>
> >>   int amdgpu_ttm_recover_gart(struct amdgpu_device *adev)
> >> --
> >> 2.7.4
> >>
> >> ___
> >> amd-gfx mailing list
> >> amd-gfx@lists.freedesktop.org
> >> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
> > ___
> > amd-gfx mailing list
> > amd-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
> 

___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH v2] drm/amd/display: Don't print error when bo_pin is interrupted

2017-10-26 Thread Andrey Grodzovsky




On 2017-10-26 04:08 PM, Harry Wentland wrote:

v2: Also don't print for ERESTARTSYS or EAGAIN

Signed-off-by: Harry Wentland 


Reviewed-by: Andrey Grodzovsky


Thanks,
Andrey


---
  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index cf15701f208d..4401f0fb3f02 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2944,7 +2944,8 @@ static int dm_plane_helper_prepare_fb(struct drm_plane 
*plane,
amdgpu_bo_unreserve(rbo);
  
  	if (unlikely(r != 0)) {

-   DRM_ERROR("Failed to pin framebuffer\n");
+   if (!(r == -EINTR || r == -ERESTARTSYS || r == EAGAIN))
+   DRM_ERROR("Failed to pin framebuffer with error %d\n", 
r);
return r;
}
  


___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

1 2 >

1 - 100 of 105 matches

Mail list logo