| Message ID | 20210326200719.1256182-1-alexander.deucher@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/amdgpu/display: fix merge breakage | expand |
Nevermind, I think I screwed this up locally. Alex On Fri, Mar 26, 2021 at 4:07 PM Alex Deucher <alexander.deucher@amd.com> wrote: > > Looks like this got accidently dropped. > > Fixes: 2cbcb78c9ee5 ("Merge tag 'amd-drm-next-5.13-2021-03-23' of https://gitlab.freedesktop.org/agd5f/linux into drm-next") > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> > Cc: daniel.vetter@ffwll.ch > --- > drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c b/drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c > index c44bb68fe2e6..1a5be2792055 100644 > --- a/drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c > +++ b/drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c > @@ -187,6 +187,10 @@ static const struct irq_source_info_funcs vupdate_no_lock_irq_info_funcs = { > .ack = NULL > }; > > +static const struct irq_source_info_funcs dmub_trace_irq_info_funcs = { > + .set = NULL, > + .ack = NULL > +}; > > static const struct irq_source_info_funcs vline0_irq_info_funcs = { > .set = NULL, > -- > 2.30.2 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c b/drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c index c44bb68fe2e6..1a5be2792055 100644 --- a/drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c +++ b/drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c @@ -187,6 +187,10 @@ static const struct irq_source_info_funcs vupdate_no_lock_irq_info_funcs = { .ack = NULL }; +static const struct irq_source_info_funcs dmub_trace_irq_info_funcs = { + .set = NULL, + .ack = NULL +}; static const struct irq_source_info_funcs vline0_irq_info_funcs = { .set = NULL,
Looks like this got accidently dropped. Fixes: 2cbcb78c9ee5 ("Merge tag 'amd-drm-next-5.13-2021-03-23' of https://gitlab.freedesktop.org/agd5f/linux into drm-next") Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: daniel.vetter@ffwll.ch --- drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c | 4 ++++ 1 file changed, 4 insertions(+)