diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2017-05-18 15:38:37 -0400 |
---|---|---|
committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2017-09-05 13:48:37 -0400 |
commit | bacdcd55fa5f833368ecf2fc271537162fd3c944 (patch) | |
tree | 8690c84c3b757c9509e33614ceaf584db21e7eee | |
parent | 17ad4fdd09e1613d7047aa9e00d7de68ad350204 (diff) |
drm/i915: Constify load detect mode
Make the mode used for load detection const, and adjust all relevant
functions to accept a const mode.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170518193837.393-2-ville.syrjala@linux.intel.com
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 12 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 216cd9e0e08f..5291e08f3436 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -9758,7 +9758,7 @@ static void i9xx_disable_cursor(struct intel_plane *plane, | |||
9758 | 9758 | ||
9759 | 9759 | ||
9760 | /* VESA 640x480x72Hz mode to set on the pipe */ | 9760 | /* VESA 640x480x72Hz mode to set on the pipe */ |
9761 | static struct drm_display_mode load_detect_mode = { | 9761 | static const struct drm_display_mode load_detect_mode = { |
9762 | DRM_MODE("640x480", DRM_MODE_TYPE_DEFAULT, 31500, 640, 664, | 9762 | DRM_MODE("640x480", DRM_MODE_TYPE_DEFAULT, 31500, 640, 664, |
9763 | 704, 832, 0, 480, 489, 491, 520, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC), | 9763 | 704, 832, 0, 480, 489, 491, 520, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC), |
9764 | }; | 9764 | }; |
@@ -9793,7 +9793,7 @@ intel_framebuffer_pitch_for_width(int width, int bpp) | |||
9793 | } | 9793 | } |
9794 | 9794 | ||
9795 | static u32 | 9795 | static u32 |
9796 | intel_framebuffer_size_for_mode(struct drm_display_mode *mode, int bpp) | 9796 | intel_framebuffer_size_for_mode(const struct drm_display_mode *mode, int bpp) |
9797 | { | 9797 | { |
9798 | u32 pitch = intel_framebuffer_pitch_for_width(mode->hdisplay, bpp); | 9798 | u32 pitch = intel_framebuffer_pitch_for_width(mode->hdisplay, bpp); |
9799 | return PAGE_ALIGN(pitch * mode->vdisplay); | 9799 | return PAGE_ALIGN(pitch * mode->vdisplay); |
@@ -9801,7 +9801,7 @@ intel_framebuffer_size_for_mode(struct drm_display_mode *mode, int bpp) | |||
9801 | 9801 | ||
9802 | static struct drm_framebuffer * | 9802 | static struct drm_framebuffer * |
9803 | intel_framebuffer_create_for_mode(struct drm_device *dev, | 9803 | intel_framebuffer_create_for_mode(struct drm_device *dev, |
9804 | struct drm_display_mode *mode, | 9804 | const struct drm_display_mode *mode, |
9805 | int depth, int bpp) | 9805 | int depth, int bpp) |
9806 | { | 9806 | { |
9807 | struct drm_framebuffer *fb; | 9807 | struct drm_framebuffer *fb; |
@@ -9828,7 +9828,7 @@ intel_framebuffer_create_for_mode(struct drm_device *dev, | |||
9828 | 9828 | ||
9829 | static struct drm_framebuffer * | 9829 | static struct drm_framebuffer * |
9830 | mode_fits_in_fbdev(struct drm_device *dev, | 9830 | mode_fits_in_fbdev(struct drm_device *dev, |
9831 | struct drm_display_mode *mode) | 9831 | const struct drm_display_mode *mode) |
9832 | { | 9832 | { |
9833 | #ifdef CONFIG_DRM_FBDEV_EMULATION | 9833 | #ifdef CONFIG_DRM_FBDEV_EMULATION |
9834 | struct drm_i915_private *dev_priv = to_i915(dev); | 9834 | struct drm_i915_private *dev_priv = to_i915(dev); |
@@ -9861,7 +9861,7 @@ mode_fits_in_fbdev(struct drm_device *dev, | |||
9861 | 9861 | ||
9862 | static int intel_modeset_setup_plane_state(struct drm_atomic_state *state, | 9862 | static int intel_modeset_setup_plane_state(struct drm_atomic_state *state, |
9863 | struct drm_crtc *crtc, | 9863 | struct drm_crtc *crtc, |
9864 | struct drm_display_mode *mode, | 9864 | const struct drm_display_mode *mode, |
9865 | struct drm_framebuffer *fb, | 9865 | struct drm_framebuffer *fb, |
9866 | int x, int y) | 9866 | int x, int y) |
9867 | { | 9867 | { |
@@ -9895,7 +9895,7 @@ static int intel_modeset_setup_plane_state(struct drm_atomic_state *state, | |||
9895 | } | 9895 | } |
9896 | 9896 | ||
9897 | int intel_get_load_detect_pipe(struct drm_connector *connector, | 9897 | int intel_get_load_detect_pipe(struct drm_connector *connector, |
9898 | struct drm_display_mode *mode, | 9898 | const struct drm_display_mode *mode, |
9899 | struct intel_load_detect_pipe *old, | 9899 | struct intel_load_detect_pipe *old, |
9900 | struct drm_modeset_acquire_ctx *ctx) | 9900 | struct drm_modeset_acquire_ctx *ctx) |
9901 | { | 9901 | { |
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index b87bbb438343..463ed152e6b1 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -1403,7 +1403,7 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv, | |||
1403 | struct intel_digital_port *dport, | 1403 | struct intel_digital_port *dport, |
1404 | unsigned int expected_mask); | 1404 | unsigned int expected_mask); |
1405 | int intel_get_load_detect_pipe(struct drm_connector *connector, | 1405 | int intel_get_load_detect_pipe(struct drm_connector *connector, |
1406 | struct drm_display_mode *mode, | 1406 | const struct drm_display_mode *mode, |
1407 | struct intel_load_detect_pipe *old, | 1407 | struct intel_load_detect_pipe *old, |
1408 | struct drm_modeset_acquire_ctx *ctx); | 1408 | struct drm_modeset_acquire_ctx *ctx); |
1409 | void intel_release_load_detect_pipe(struct drm_connector *connector, | 1409 | void intel_release_load_detect_pipe(struct drm_connector *connector, |