From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: Boris Brezillon <boris.brezillon@bootlin.com>
Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/amd: Compile fix for amdgpu_dm.c
Date: Wed, 12 Dec 2018 15:04:17 +0200 [thread overview]
Message-ID: <87r2emsxpq.fsf@gaia.fi.intel.com> (raw)
In-Reply-To: <20181212135448.1e2ea1d1@bbrezillon>
Boris Brezillon <boris.brezillon@bootlin.com> writes:
> On Wed, 12 Dec 2018 13:44:13 +0200
> Mika Kuoppala <mika.kuoppala@linux.intel.com> wrote:
>
>> Fix compilation issue with CONFIG_DRM_AMDGPU on:
>> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function ‘amdgpu_dm_mode_config_init’:
>> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1666:30: error: passing argument 1 of ‘drm_atomic_private_obj_init’ from incompatible pointer type
>>
>> Fixes: b962a12050a3 ("drm/atomic: integrate modeset lock with private objects")
>> Cc: Rob Clark <robdclark@gmail.com>
>> Cc: Boris Brezillon <boris.brezillon@bootlin.com>
>> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>> Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
>> Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
>> ---
>> 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 1691864bf59b..fd3ed2ce9cb1 100644
>> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> @@ -1663,7 +1663,8 @@ static int amdgpu_dm_mode_config_init(struct amdgpu_device *adev)
>>
>> dc_resource_state_copy_construct_current(adev->dm.dc, state->context);
>>
>> - drm_atomic_private_obj_init(&adev->dm.atomic_obj,
>> + drm_atomic_private_obj_init(adev->ddev,
>> + &adev->dm.atomic_obj,
>> &state->base,
>> &dm_atomic_state_funcs);
>
> Hm, looks like drm-misc-next does not have this call to
> drm_atomic_private_obj_init() which explains why I didn't patch the
> file.
Hmm, merge conflict it is then...sorry for pointing at wrong direction.
-Mika
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-12-12 13:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-12 11:44 [PATCH] drm/amd: Compile fix for amdgpu_dm.c Mika Kuoppala
2018-12-12 11:51 ` ✗ Fi.CI.BAT: failure for " Patchwork
2018-12-12 12:50 ` [PATCH] " Boris Brezillon
2018-12-12 12:54 ` Boris Brezillon
2018-12-12 13:04 ` Mika Kuoppala [this message]
2018-12-12 13:10 ` Boris Brezillon
2018-12-13 18:57 ` kbuild test robot
2018-12-20 2:20 ` kbuild test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r2emsxpq.fsf@gaia.fi.intel.com \
--to=mika.kuoppala@linux.intel.com \
--cc=boris.brezillon@bootlin.com \
--cc=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=tomi.p.sarvela@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.