From e330fbca73950b4716c0e4c5bfe8fe87cb255b10 Mon Sep 17 00:00:00 2001 From: Michael Moll Date: Fri, 26 Jan 2024 16:34:01 +0100 Subject: [PATCH] fix build --- drivers/gpu/drm/verisilicon/vs_dc.c | 3 --- include/linux/i2c.h | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/verisilicon/vs_dc.c b/drivers/gpu/drm/verisilicon/vs_dc.c index b5ab92d980364f..da9a7908e5810c 100644 --- a/drivers/gpu/drm/verisilicon/vs_dc.c +++ b/drivers/gpu/drm/verisilicon/vs_dc.c @@ -651,14 +651,11 @@ static void update_cursor_plane(struct vs_dc *dc, struct vs_plane *plane, struct drm_plane_state *state = drm_atomic_get_new_plane_state(drm_state, drm_plane); struct vs_plane_state *plane_state = to_vs_plane_state(state); - struct drm_framebuffer *drm_fb = state->fb; struct dc_hw_cursor cursor; cursor.address = plane_state->dma_addr[0]; cursor.x = state->crtc_x; cursor.y = state->crtc_y; - cursor.hot_x = drm_fb->hot_x; - cursor.hot_y = drm_fb->hot_y; cursor.display_id = to_vs_display_id(dc, state->crtc); update_cursor_size(state, &cursor); cursor.enable = true; diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 652ecb7abedae4..bc9d149ca468e5 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -852,6 +852,7 @@ static inline void i2c_mark_adapter_resumed(struct i2c_adapter *adap) /* i2c adapter classes (bitmask) */ #define I2C_CLASS_HWMON (1<<0) /* lm_sensors, ... */ +#define I2C_CLASS_DDC (1<<3) /* DDC bus on graphics adapters */ #define I2C_CLASS_SPD (1<<7) /* Memory modules */ /* Warn users that the adapter doesn't support classes anymore */ #define I2C_CLASS_DEPRECATED (1<<8)