Skip to content

Commit 1b93d3c

Browse files
dakrdliviu
dakr
authored and
dliviu
committed
drm/arm/malidp: replace drm->dev_private with drm_to_malidp()
Using drm_device->dev_private is deprecated. Since we've switched to devm_drm_dev_alloc(), struct drm_device is now embedded in struct malidp_drm, hence we can use container_of() to get the struct drm_device instance instead. Signed-off-by: Danilo Krummrich <[email protected]> Signed-off-by: Liviu Dudau <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent aefae87 commit 1b93d3c

File tree

6 files changed

+25
-27
lines changed

6 files changed

+25
-27
lines changed

‎drivers/gpu/drm/arm/malidp_crtc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ static const struct drm_crtc_funcs malidp_crtc_funcs = {
526526

527527
int malidp_crtc_init(struct drm_device *drm)
528528
{
529-
struct malidp_drm *malidp = drm->dev_private;
529+
struct malidp_drm *malidp = drm_to_malidp(drm);
530530
struct drm_plane *primary = NULL, *plane;
531531
int ret;
532532

‎drivers/gpu/drm/arm/malidp_drv.c

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ static void malidp_atomic_commit_se_config(struct drm_crtc *crtc,
169169
*/
170170
static int malidp_set_and_wait_config_valid(struct drm_device *drm)
171171
{
172-
struct malidp_drm *malidp = drm->dev_private;
172+
struct malidp_drm *malidp = drm_to_malidp(drm);
173173
struct malidp_hw_device *hwdev = malidp->dev;
174174
int ret;
175175

@@ -190,7 +190,7 @@ static int malidp_set_and_wait_config_valid(struct drm_device *drm)
190190
static void malidp_atomic_commit_hw_done(struct drm_atomic_state *state)
191191
{
192192
struct drm_device *drm = state->dev;
193-
struct malidp_drm *malidp = drm->dev_private;
193+
struct malidp_drm *malidp = drm_to_malidp(drm);
194194
int loop = 5;
195195

196196
malidp->event = malidp->crtc.state->event;
@@ -231,7 +231,7 @@ static void malidp_atomic_commit_hw_done(struct drm_atomic_state *state)
231231
static void malidp_atomic_commit_tail(struct drm_atomic_state *state)
232232
{
233233
struct drm_device *drm = state->dev;
234-
struct malidp_drm *malidp = drm->dev_private;
234+
struct malidp_drm *malidp = drm_to_malidp(drm);
235235
struct drm_crtc *crtc;
236236
struct drm_crtc_state *old_crtc_state;
237237
int i;
@@ -393,7 +393,7 @@ static const struct drm_mode_config_funcs malidp_mode_config_funcs = {
393393
static int malidp_init(struct drm_device *drm)
394394
{
395395
int ret;
396-
struct malidp_drm *malidp = drm->dev_private;
396+
struct malidp_drm *malidp = drm_to_malidp(drm);
397397
struct malidp_hw_device *hwdev = malidp->dev;
398398

399399
drm_mode_config_init(drm);
@@ -429,7 +429,7 @@ static int malidp_irq_init(struct platform_device *pdev)
429429
{
430430
int irq_de, irq_se, ret = 0;
431431
struct drm_device *drm = dev_get_drvdata(&pdev->dev);
432-
struct malidp_drm *malidp = drm->dev_private;
432+
struct malidp_drm *malidp = drm_to_malidp(drm);
433433
struct malidp_hw_device *hwdev = malidp->dev;
434434

435435
/* fetch the interrupts from DT */
@@ -463,7 +463,7 @@ static int malidp_dumb_create(struct drm_file *file_priv,
463463
struct drm_device *drm,
464464
struct drm_mode_create_dumb *args)
465465
{
466-
struct malidp_drm *malidp = drm->dev_private;
466+
struct malidp_drm *malidp = drm_to_malidp(drm);
467467
/* allocate for the worst case scenario, i.e. rotated buffers */
468468
u8 alignment = malidp_hw_get_pitch_align(malidp->dev, 1);
469469

@@ -509,7 +509,7 @@ static void malidp_error_stats_dump(const char *prefix,
509509
static int malidp_show_stats(struct seq_file *m, void *arg)
510510
{
511511
struct drm_device *drm = m->private;
512-
struct malidp_drm *malidp = drm->dev_private;
512+
struct malidp_drm *malidp = drm_to_malidp(drm);
513513
unsigned long irqflags;
514514
struct malidp_error_stats de_errors, se_errors;
515515

@@ -532,7 +532,7 @@ static ssize_t malidp_debugfs_write(struct file *file, const char __user *ubuf,
532532
{
533533
struct seq_file *m = file->private_data;
534534
struct drm_device *drm = m->private;
535-
struct malidp_drm *malidp = drm->dev_private;
535+
struct malidp_drm *malidp = drm_to_malidp(drm);
536536
unsigned long irqflags;
537537

538538
spin_lock_irqsave(&malidp->errors_lock, irqflags);
@@ -553,7 +553,7 @@ static const struct file_operations malidp_debugfs_fops = {
553553

554554
static void malidp_debugfs_init(struct drm_minor *minor)
555555
{
556-
struct malidp_drm *malidp = minor->dev->dev_private;
556+
struct malidp_drm *malidp = drm_to_malidp(minor->dev);
557557

558558
malidp_error_stats_init(&malidp->de_errors);
559559
malidp_error_stats_init(&malidp->se_errors);
@@ -653,7 +653,7 @@ static ssize_t core_id_show(struct device *dev, struct device_attribute *attr,
653653
char *buf)
654654
{
655655
struct drm_device *drm = dev_get_drvdata(dev);
656-
struct malidp_drm *malidp = drm->dev_private;
656+
struct malidp_drm *malidp = drm_to_malidp(drm);
657657

658658
return snprintf(buf, PAGE_SIZE, "%08x\n", malidp->core_id);
659659
}
@@ -671,7 +671,7 @@ ATTRIBUTE_GROUPS(mali_dp);
671671
static int malidp_runtime_pm_suspend(struct device *dev)
672672
{
673673
struct drm_device *drm = dev_get_drvdata(dev);
674-
struct malidp_drm *malidp = drm->dev_private;
674+
struct malidp_drm *malidp = drm_to_malidp(drm);
675675
struct malidp_hw_device *hwdev = malidp->dev;
676676

677677
/* we can only suspend if the hardware is in config mode */
@@ -690,7 +690,7 @@ static int malidp_runtime_pm_suspend(struct device *dev)
690690
static int malidp_runtime_pm_resume(struct device *dev)
691691
{
692692
struct drm_device *drm = dev_get_drvdata(dev);
693-
struct malidp_drm *malidp = drm->dev_private;
693+
struct malidp_drm *malidp = drm_to_malidp(drm);
694694
struct malidp_hw_device *hwdev = malidp->dev;
695695

696696
clk_prepare_enable(hwdev->pclk);
@@ -756,7 +756,6 @@ static int malidp_bind(struct device *dev)
756756
if (ret && ret != -ENODEV)
757757
return ret;
758758

759-
drm->dev_private = malidp;
760759
dev_set_drvdata(dev, drm);
761760

762761
/* Enable power management */
@@ -882,7 +881,6 @@ static int malidp_bind(struct device *dev)
882881
pm_runtime_disable(dev);
883882
else
884883
malidp_runtime_pm_suspend(dev);
885-
drm->dev_private = NULL;
886884
dev_set_drvdata(dev, NULL);
887885
of_reserved_mem_device_release(dev);
888886

@@ -892,7 +890,7 @@ static int malidp_bind(struct device *dev)
892890
static void malidp_unbind(struct device *dev)
893891
{
894892
struct drm_device *drm = dev_get_drvdata(dev);
895-
struct malidp_drm *malidp = drm->dev_private;
893+
struct malidp_drm *malidp = drm_to_malidp(drm);
896894
struct malidp_hw_device *hwdev = malidp->dev;
897895

898896
drm_dev_unregister(drm);
@@ -910,7 +908,6 @@ static void malidp_unbind(struct device *dev)
910908
pm_runtime_disable(dev);
911909
else
912910
malidp_runtime_pm_suspend(dev);
913-
drm->dev_private = NULL;
914911
dev_set_drvdata(dev, NULL);
915912
of_reserved_mem_device_release(dev);
916913
}

‎drivers/gpu/drm/arm/malidp_drv.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ struct malidp_drm {
4545
#endif
4646
};
4747

48+
#define drm_to_malidp(x) container_of(x, struct malidp_drm, base)
4849
#define crtc_to_malidp_device(x) container_of(x, struct malidp_drm, crtc)
4950

5051
struct malidp_plane {

‎drivers/gpu/drm/arm/malidp_hw.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1168,7 +1168,7 @@ static void malidp_hw_clear_irq(struct malidp_hw_device *hwdev, u8 block, u32 ir
11681168
static irqreturn_t malidp_de_irq(int irq, void *arg)
11691169
{
11701170
struct drm_device *drm = arg;
1171-
struct malidp_drm *malidp = drm->dev_private;
1171+
struct malidp_drm *malidp = drm_to_malidp(drm);
11721172
struct malidp_hw_device *hwdev;
11731173
struct malidp_hw *hw;
11741174
const struct malidp_irq_map *de;
@@ -1226,7 +1226,7 @@ static irqreturn_t malidp_de_irq(int irq, void *arg)
12261226
static irqreturn_t malidp_de_irq_thread_handler(int irq, void *arg)
12271227
{
12281228
struct drm_device *drm = arg;
1229-
struct malidp_drm *malidp = drm->dev_private;
1229+
struct malidp_drm *malidp = drm_to_malidp(drm);
12301230

12311231
wake_up(&malidp->wq);
12321232

@@ -1252,7 +1252,7 @@ void malidp_de_irq_hw_init(struct malidp_hw_device *hwdev)
12521252

12531253
int malidp_de_irq_init(struct drm_device *drm, int irq)
12541254
{
1255-
struct malidp_drm *malidp = drm->dev_private;
1255+
struct malidp_drm *malidp = drm_to_malidp(drm);
12561256
struct malidp_hw_device *hwdev = malidp->dev;
12571257
int ret;
12581258

@@ -1286,7 +1286,7 @@ void malidp_de_irq_fini(struct malidp_hw_device *hwdev)
12861286
static irqreturn_t malidp_se_irq(int irq, void *arg)
12871287
{
12881288
struct drm_device *drm = arg;
1289-
struct malidp_drm *malidp = drm->dev_private;
1289+
struct malidp_drm *malidp = drm_to_malidp(drm);
12901290
struct malidp_hw_device *hwdev = malidp->dev;
12911291
struct malidp_hw *hw = hwdev->hw;
12921292
const struct malidp_irq_map *se = &hw->map.se_irq_map;
@@ -1363,7 +1363,7 @@ static irqreturn_t malidp_se_irq_thread_handler(int irq, void *arg)
13631363

13641364
int malidp_se_irq_init(struct drm_device *drm, int irq)
13651365
{
1366-
struct malidp_drm *malidp = drm->dev_private;
1366+
struct malidp_drm *malidp = drm_to_malidp(drm);
13671367
struct malidp_hw_device *hwdev = malidp->dev;
13681368
int ret;
13691369

‎drivers/gpu/drm/arm/malidp_mw.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ malidp_mw_encoder_atomic_check(struct drm_encoder *encoder,
129129
struct drm_connector_state *conn_state)
130130
{
131131
struct malidp_mw_connector_state *mw_state = to_mw_state(conn_state);
132-
struct malidp_drm *malidp = encoder->dev->dev_private;
132+
struct malidp_drm *malidp = drm_to_malidp(encoder->dev);
133133
struct drm_framebuffer *fb;
134134
int i, n_planes;
135135

@@ -207,7 +207,7 @@ static u32 *get_writeback_formats(struct malidp_drm *malidp, int *n_formats)
207207

208208
int malidp_mw_connector_init(struct drm_device *drm)
209209
{
210-
struct malidp_drm *malidp = drm->dev_private;
210+
struct malidp_drm *malidp = drm_to_malidp(drm);
211211
u32 *formats;
212212
int ret, n_formats;
213213

@@ -236,7 +236,7 @@ int malidp_mw_connector_init(struct drm_device *drm)
236236
void malidp_mw_atomic_commit(struct drm_device *drm,
237237
struct drm_atomic_state *old_state)
238238
{
239-
struct malidp_drm *malidp = drm->dev_private;
239+
struct malidp_drm *malidp = drm_to_malidp(drm);
240240
struct drm_writeback_connector *mw_conn = &malidp->mw_connector;
241241
struct drm_connector_state *conn_state = mw_conn->base.state;
242242
struct malidp_hw_device *hwdev = malidp->dev;

‎drivers/gpu/drm/arm/malidp_planes.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ bool malidp_format_mod_supported(struct drm_device *drm,
151151
{
152152
const struct drm_format_info *info;
153153
const u64 *modifiers;
154-
struct malidp_drm *malidp = drm->dev_private;
154+
struct malidp_drm *malidp = drm_to_malidp(drm);
155155
const struct malidp_hw_regmap *map = &malidp->dev->hw->map;
156156

157157
if (WARN_ON(modifier == DRM_FORMAT_MOD_INVALID))
@@ -931,7 +931,7 @@ static const uint64_t linear_only_modifiers[] = {
931931

932932
int malidp_de_planes_init(struct drm_device *drm)
933933
{
934-
struct malidp_drm *malidp = drm->dev_private;
934+
struct malidp_drm *malidp = drm_to_malidp(drm);
935935
const struct malidp_hw_regmap *map = &malidp->dev->hw->map;
936936
struct malidp_plane *plane = NULL;
937937
enum drm_plane_type plane_type;

0 commit comments

Comments
 (0)