diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-10-17 10:45:05 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-10-17 10:53:43 +1000 |
| commit | bd21a37d41c3b3088aeae59f54fd82de0ddb6fdd (patch) | |
| tree | 985dc5b65d2adb36a3671e78a174b3aaac4b6f50 /drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | |
| parent | d7205d5c0f2b09d900231de9026b97105c37d343 (diff) | |
| parent | 6c94804fde4415f3938778155d8e665e6870a46d (diff) | |
| download | talos-op-linux-bd21a37d41c3b3088aeae59f54fd82de0ddb6fdd.tar.gz talos-op-linux-bd21a37d41c3b3088aeae59f54fd82de0ddb6fdd.zip | |
Merge remote-tracking branch 'pfdo/drm-next' into drm-next
Pull in drm-next for the object find API changes.
Fix the one place the API crashes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 |
1 files changed, 1 insertions, 1 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 e98bb639268d..8cc228ebdc9a 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2638,7 +2638,7 @@ static struct drm_encoder *best_encoder(struct drm_connector *connector) /* pick the encoder ids */ if (enc_id) { - obj = drm_mode_object_find(connector->dev, enc_id, DRM_MODE_OBJECT_ENCODER); + obj = drm_mode_object_find(connector->dev, NULL, enc_id, DRM_MODE_OBJECT_ENCODER); if (!obj) { DRM_ERROR("Couldn't find a matching encoder for our connector\n"); return NULL; |
