| Message ID | 20220804055036.691670-1-airlied@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/amd/display: restore plane with no modifiers code. | expand |
On 2022-08-04 01:50, Dave Airlie wrote: > When this file was split in > > 5d945cbcd4b16a29d6470a80dfb19738f9a4319f > Author: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> > Date: Wed Jul 20 15:31:42 2022 -0400 > > drm/amd/display: Create a file dedicated to planes > > This chunk seemed to get dropped. Linus noticed on this > rx580 and I've reproduced on FIJI which makes sense as these > are pre-modifier GPUs. > > With this applied, I get gdm back. > > Fixes: 5d945cbcd4b1 ("drm/amd/display: Create a file dedicated to planes") > Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Harry Wentland <harry.wentland@amd.com> Harry > --- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c > index 8cd25b2ea0dc..b841b8b0a9d8 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c > @@ -1591,6 +1591,9 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm, > if (res) > return res; > > + if (modifiers == NULL) > + adev_to_drm(dm->adev)->mode_config.fb_modifiers_not_supported = true; > + > res = drm_universal_plane_init(adev_to_drm(dm->adev), plane, possible_crtcs, > &dm_plane_funcs, formats, num_formats, > modifiers, plane->type, NULL);
On Wed, Aug 3, 2022 at 10:50 PM Dave Airlie <airlied@redhat.com> wrote: > > With this applied, I get gdm back. I can confirm that it makes thing work again for me too. Applied. Linus
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c index 8cd25b2ea0dc..b841b8b0a9d8 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c @@ -1591,6 +1591,9 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm, if (res) return res; + if (modifiers == NULL) + adev_to_drm(dm->adev)->mode_config.fb_modifiers_not_supported = true; + res = drm_universal_plane_init(adev_to_drm(dm->adev), plane, possible_crtcs, &dm_plane_funcs, formats, num_formats, modifiers, plane->type, NULL);
When this file was split in 5d945cbcd4b16a29d6470a80dfb19738f9a4319f Author: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> Date: Wed Jul 20 15:31:42 2022 -0400 drm/amd/display: Create a file dedicated to planes This chunk seemed to get dropped. Linus noticed on this rx580 and I've reproduced on FIJI which makes sense as these are pre-modifier GPUs. With this applied, I get gdm back. Fixes: 5d945cbcd4b1 ("drm/amd/display: Create a file dedicated to planes") Signed-off-by: Dave Airlie <airlied@redhat.com> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 3 +++ 1 file changed, 3 insertions(+)