xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/atmel-hlcdc: Use crtc->mode_valid() callback

Browse Source 
Now that we have a callback to check if crtc supports a given mode
we can use it in atmel-hlcdc so that we restrict the number of probbed
modes to the ones we can actually display.

Also, remove the mode_fixup() callback as this is no longer needed
because mode_valid() will be called before.

Signed-off-by: Jose Abreu <joabreu@synopsys.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Link: http://patchwork.freedesktop.org/patch/msgid/95fd6c06c58bd0b957e36a8d7068e6a74b581304.1495720737.git.joabreu@synopsys.com
This commit is contained in:
Jose Abreu
2017-05-25 15:19:21 +01:00
committed by Boris Brezillon
parent 991dca01dd
commit a57bf53e29
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
View File

@@ -140,13 +140,13 @@ static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c)
cfg); cfg);
} }
static bool atmel_hlcdc_crtc_mode_fixup(struct drm_crtc *c, static enum drm_mode_status
const struct drm_display_mode *mode, atmel_hlcdc_crtc_mode_valid(struct drm_crtc *c,
struct drm_display_mode *adjusted_mode) const struct drm_display_mode *mode)
{ {
struct atmel_hlcdc_crtc *crtc = drm_crtc_to_atmel_hlcdc_crtc(c); struct atmel_hlcdc_crtc *crtc = drm_crtc_to_atmel_hlcdc_crtc(c);
return atmel_hlcdc_dc_mode_valid(crtc->dc, adjusted_mode) == MODE_OK; return atmel_hlcdc_dc_mode_valid(crtc->dc, mode);
} }
static void atmel_hlcdc_crtc_disable(struct drm_crtc *c) static void atmel_hlcdc_crtc_disable(struct drm_crtc *c)
@@ -315,7 +315,7 @@ static void atmel_hlcdc_crtc_atomic_flush(struct drm_crtc *crtc,
} }
static const struct drm_crtc_helper_funcs lcdc_crtc_helper_funcs = { static const struct drm_crtc_helper_funcs lcdc_crtc_helper_funcs = {
.mode_fixup = atmel_hlcdc_crtc_mode_fixup, .mode_valid = atmel_hlcdc_crtc_mode_valid,
.mode_set = drm_helper_crtc_mode_set, .mode_set = drm_helper_crtc_mode_set,
.mode_set_nofb = atmel_hlcdc_crtc_mode_set_nofb, .mode_set_nofb = atmel_hlcdc_crtc_mode_set_nofb,
.mode_set_base = drm_helper_crtc_mode_set_base, .mode_set_base = drm_helper_crtc_mode_set_base,

5
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
View File

@@ -375,8 +375,9 @@ static const struct of_device_id atmel_hlcdc_of_match[] = {
}; };
MODULE_DEVICE_TABLE(of, atmel_hlcdc_of_match); MODULE_DEVICE_TABLE(of, atmel_hlcdc_of_match);
int atmel_hlcdc_dc_mode_valid(struct atmel_hlcdc_dc *dc, enum drm_mode_status
struct drm_display_mode *mode) atmel_hlcdc_dc_mode_valid(struct atmel_hlcdc_dc *dc,
const struct drm_display_mode *mode)
{ {
int vfront_porch = mode->vsync_start - mode->vdisplay; int vfront_porch = mode->vsync_start - mode->vdisplay;
int vback_porch = mode->vtotal - mode->vsync_end; int vback_porch = mode->vtotal - mode->vsync_end;

5
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h
View File

@@ -422,8 +422,9 @@ static inline void atmel_hlcdc_layer_init(struct atmel_hlcdc_layer *layer,
layer->regmap = regmap; layer->regmap = regmap;
} }
int atmel_hlcdc_dc_mode_valid(struct atmel_hlcdc_dc *dc, enum drm_mode_status
struct drm_display_mode *mode); atmel_hlcdc_dc_mode_valid(struct atmel_hlcdc_dc *dc,
const struct drm_display_mode *mode);
int atmel_hlcdc_create_planes(struct drm_device *dev); int atmel_hlcdc_create_planes(struct drm_device *dev);
void atmel_hlcdc_plane_irq(struct atmel_hlcdc_plane *plane); void atmel_hlcdc_plane_irq(struct atmel_hlcdc_plane *plane);