Merge tag 'amd-drm-next-6.5-2023-06-09' of https://gitlab.freedesktop.org/agd5f/linux...

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_encoders.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c
index 27a782a9dc72817d25ae6ee4f4cf75d119ac6dbb..3aaeed2d356208d5601ccfdd84d2ca84ef79c9a9 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c
@@ -70,6 +70,7 @@ void amdgpu_encoder_set_active_device(struct drm_encoder *encoder)
        drm_for_each_connector_iter(connector, &iter) {
                if (connector->encoder == encoder) {
                        struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector);
        drm_for_each_connector_iter(connector, &iter) {
                if (connector->encoder == encoder) {
                        struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector);

+

                        amdgpu_encoder->active_device = amdgpu_encoder->devices & amdgpu_connector->devices;
                        DRM_DEBUG_KMS("setting active device to %08x from %08x %08x for encoder %d\n",
                                  amdgpu_encoder->active_device, amdgpu_encoder->devices,
                        amdgpu_encoder->active_device = amdgpu_encoder->devices & amdgpu_connector->devices;
                        DRM_DEBUG_KMS("setting active device to %08x from %08x %08x for encoder %d\n",
                                  amdgpu_encoder->active_device, amdgpu_encoder->devices,


@@ -165,12 +166,12 @@ void amdgpu_panel_mode_fixup(struct drm_encoder *encoder,
 {
        struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder);
        struct drm_display_mode *native_mode = &amdgpu_encoder->native_mode;
 {
        struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder);
        struct drm_display_mode *native_mode = &amdgpu_encoder->native_mode;

-       unsigned hblank = native_mode->htotal - native_mode->hdisplay;
-       unsigned vblank = native_mode->vtotal - native_mode->vdisplay;
-       unsigned hover = native_mode->hsync_start - native_mode->hdisplay;
-       unsigned vover = native_mode->vsync_start - native_mode->vdisplay;
-       unsigned hsync_width = native_mode->hsync_end - native_mode->hsync_start;
-       unsigned vsync_width = native_mode->vsync_end - native_mode->vsync_start;
+       unsigned int hblank = native_mode->htotal - native_mode->hdisplay;
+       unsigned int vblank = native_mode->vtotal - native_mode->vdisplay;
+       unsigned int hover = native_mode->hsync_start - native_mode->hdisplay;
+       unsigned int vover = native_mode->vsync_start - native_mode->vdisplay;
+       unsigned int hsync_width = native_mode->hsync_end - native_mode->hsync_start;
+       unsigned int vsync_width = native_mode->vsync_end - native_mode->vsync_start;

 
        adjusted_mode->clock = native_mode->clock;
        adjusted_mode->flags = native_mode->flags;
 
        adjusted_mode->clock = native_mode->clock;
        adjusted_mode->flags = native_mode->flags;