|
@@ -691,9 +691,6 @@ struct drm_atomic_state *
|
|
dm_atomic_state_alloc(struct drm_device *dev)
|
|
dm_atomic_state_alloc(struct drm_device *dev)
|
|
{
|
|
{
|
|
struct dm_atomic_state *state = kzalloc(sizeof(*state), GFP_KERNEL);
|
|
struct dm_atomic_state *state = kzalloc(sizeof(*state), GFP_KERNEL);
|
|
- struct validate_context *new_ctx;
|
|
|
|
- struct amdgpu_device *adev = dev->dev_private;
|
|
|
|
- struct dc *dc = adev->dm.dc;
|
|
|
|
|
|
|
|
if (!state)
|
|
if (!state)
|
|
return NULL;
|
|
return NULL;
|
|
@@ -701,16 +698,6 @@ dm_atomic_state_alloc(struct drm_device *dev)
|
|
if (drm_atomic_state_init(dev, &state->base) < 0)
|
|
if (drm_atomic_state_init(dev, &state->base) < 0)
|
|
goto fail;
|
|
goto fail;
|
|
|
|
|
|
- /* copy existing configuration */
|
|
|
|
- new_ctx = dc_create_state();
|
|
|
|
-
|
|
|
|
- if (!new_ctx)
|
|
|
|
- goto fail;
|
|
|
|
-
|
|
|
|
- dc_resource_validate_ctx_copy_construct_current(dc, new_ctx);
|
|
|
|
-
|
|
|
|
- state->context = new_ctx;
|
|
|
|
-
|
|
|
|
return &state->base;
|
|
return &state->base;
|
|
|
|
|
|
fail:
|
|
fail:
|
|
@@ -4465,6 +4452,10 @@ int amdgpu_dm_atomic_check(struct drm_device *dev,
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ dm_state->context = dc_create_state();
|
|
|
|
+ ASSERT(dm_state->context);
|
|
|
|
+ dc_resource_validate_ctx_copy_construct_current(dc, dm_state->context);
|
|
|
|
+
|
|
/* copy existing configuration */
|
|
/* copy existing configuration */
|
|
set_count = 0;
|
|
set_count = 0;
|
|
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
|
|
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
|