| Message ID | 20201103215450.815572-1-alexander.deucher@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/amdgpu/virt: fix handling of the atomic flag | expand |
On 2020-11-03 4:54 p.m., Alex Deucher wrote: > Use the per device drm driver feature flags rather than the > global one. This way we can make the drm driver struct const. > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Luben Tuikov <luben.tuikov@amd.com> Yeah, that's a good change. Regards, Luben > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c > index d0aea5e39531..8aff6ef50f91 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c > @@ -47,11 +47,13 @@ bool amdgpu_virt_mmio_blocked(struct amdgpu_device *adev) > > void amdgpu_virt_init_setting(struct amdgpu_device *adev) > { > + struct drm_device *ddev = adev_to_drm(adev); > + > /* enable virtual display */ > if (adev->mode_info.num_crtc == 0) > adev->mode_info.num_crtc = 1; > adev->enable_virtual_display = true; > - adev_to_drm(adev)->driver->driver_features &= ~DRIVER_ATOMIC; > + ddev->driver_features &= ~DRIVER_ATOMIC; > adev->cg_flags = 0; > adev->pg_flags = 0; > } >
On Tue, Nov 03, 2020 at 04:54:50PM -0500, Alex Deucher wrote: > Use the per device drm driver feature flags rather than the > global one. This way we can make the drm driver struct const. > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Can we merge this through drm-misc-next so I can follow up with the drm_device constification series there? Otherwise I need to sit on that for another few weeks until all the backmerges are done. -Daniel > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c > index d0aea5e39531..8aff6ef50f91 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c > @@ -47,11 +47,13 @@ bool amdgpu_virt_mmio_blocked(struct amdgpu_device *adev) > > void amdgpu_virt_init_setting(struct amdgpu_device *adev) > { > + struct drm_device *ddev = adev_to_drm(adev); > + > /* enable virtual display */ > if (adev->mode_info.num_crtc == 0) > adev->mode_info.num_crtc = 1; > adev->enable_virtual_display = true; > - adev_to_drm(adev)->driver->driver_features &= ~DRIVER_ATOMIC; > + ddev->driver_features &= ~DRIVER_ATOMIC; > adev->cg_flags = 0; > adev->pg_flags = 0; > } > -- > 2.25.4 >
On Wed, Nov 4, 2020 at 4:39 AM Daniel Vetter <daniel@ffwll.ch> wrote: > > On Tue, Nov 03, 2020 at 04:54:50PM -0500, Alex Deucher wrote: > > Use the per device drm driver feature flags rather than the > > global one. This way we can make the drm driver struct const. > > > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> > > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > Can we merge this through drm-misc-next so I can follow up with the > drm_device constification series there? Otherwise I need to sit on that > for another few weeks until all the backmerges are done. Sure feel free to add it to your series and merge it with the rest, or I can merge it now. Alex > -Daniel > > > --- > > drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c > > index d0aea5e39531..8aff6ef50f91 100644 > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c > > @@ -47,11 +47,13 @@ bool amdgpu_virt_mmio_blocked(struct amdgpu_device *adev) > > > > void amdgpu_virt_init_setting(struct amdgpu_device *adev) > > { > > + struct drm_device *ddev = adev_to_drm(adev); > > + > > /* enable virtual display */ > > if (adev->mode_info.num_crtc == 0) > > adev->mode_info.num_crtc = 1; > > adev->enable_virtual_display = true; > > - adev_to_drm(adev)->driver->driver_features &= ~DRIVER_ATOMIC; > > + ddev->driver_features &= ~DRIVER_ATOMIC; > > adev->cg_flags = 0; > > adev->pg_flags = 0; > > } > > -- > > 2.25.4 > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c index d0aea5e39531..8aff6ef50f91 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c @@ -47,11 +47,13 @@ bool amdgpu_virt_mmio_blocked(struct amdgpu_device *adev) void amdgpu_virt_init_setting(struct amdgpu_device *adev) { + struct drm_device *ddev = adev_to_drm(adev); + /* enable virtual display */ if (adev->mode_info.num_crtc == 0) adev->mode_info.num_crtc = 1; adev->enable_virtual_display = true; - adev_to_drm(adev)->driver->driver_features &= ~DRIVER_ATOMIC; + ddev->driver_features &= ~DRIVER_ATOMIC; adev->cg_flags = 0; adev->pg_flags = 0; }
Use the per device drm driver feature flags rather than the global one. This way we can make the drm driver struct const. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)